#1201 - Fix issue with setting source date when using .kip directories

earth_enterprise/src/fusion/autoingest/plugins.src/PacketGen.src

@@ -190,9 +190,12 @@ void PacketGenAssetVersionImplD::UpdateChildren(
                                     inset.alphaRPFile,
                                     std::string(), /* cached blend */
                                     std::string()  /* cached blend alpha */));
+        std::string acquisitionDate = inset.resource_->GetAcquisitionDate();
+
         packetLevelConfig.attributions.push_back
           (PacketLevelConfig::Attribution(
               inset.dataRPFile,
+              acquisitionDate,
               inset.combinedrp_->config.fuid_resource_));
       }
     } else {
@@ -221,9 +224,12 @@ void PacketGenAssetVersionImplD::UpdateChildren(
       for (std::vector<uint>::const_iterator idx = neededIndexes.begin();
            idx != neededIndexes.end(); ++idx) {
         const InsetInfo<ProductAssetVersion> &inset(*extra.insetInfo[*idx]);
+        std::string acquisitionDate = inset.resource_->GetAcquisitionDate();
+
         packetLevelConfig.attributions.push_back
           (PacketLevelConfig::Attribution(
               inset.dataRPFile,
+              acquisitionDate,
               inset.combinedrp_->config.fuid_resource_));
       }
 

earth_enterprise/src/fusion/autoingest/storage/PacketLevelConfig.idl

@@ -48,6 +48,7 @@ class PacketLevelConfig {
 
   class Attribution {
     std::string dataRP;
+    std::string acquisitionDate;
     uint32      fuid_resource_;
   };
 

earth_enterprise/src/fusion/khraster/AttributionByExtents.cpp

@@ -20,7 +20,7 @@
 #include <khTileAddr.h>
 #include <common/khConstants.h>
 
-AttributionByExtents::Inset::Inset(const std::string &rppath, uint32 id) :
+AttributionByExtents::Inset::Inset(const std::string &rppath, uint32 id, const std::string &acquisitionDate) :
     inset_id_(id)
 {
   khDeleteGuard<khRasterProduct> rp(khRasterProduct::Open(rppath));
@@ -29,7 +29,11 @@ AttributionByExtents::Inset::Inset(const std::string &rppath, uint32 id) :
   }
   max_level_   = rp->maxLevel();
   deg_extents_ = rp->degOrMeterExtents();
-  acquisition_date_ = rp->GetAcquisitionDate();
+  if (acquisitionDate != kUnknownDateTimeUTC && acquisitionDate != kUnknownDate) {
+    acquisition_date_ = acquisitionDate;
+  } else {
+    acquisition_date_ = rp->GetAcquisitionDate();
+  }
 }
 
 uint32 AttributionByExtents::GetInternalInsetIndex(const khTileAddr &addr)

earth_enterprise/src/fusion/khraster/AttributionByExtents.h

@@ -33,7 +33,7 @@ class AttributionByExtents {
     uint32            inset_id_;
     std::string       acquisition_date_;
 
-    Inset(const std::string &rppath, uint32 id);
+    Inset(const std::string &rppath, uint32 id, const std::string &acquisitionDate);
   };
 
   // will we ordered low-res to high-res
@@ -42,8 +42,8 @@ class AttributionByExtents {
 public:
   AttributionByExtents(void) { }
 
-  void AddInset(const std::string &rppath, uint32 id) {
-    insets.push_back(Inset(rppath, id));
+  void AddInset(const std::string &rppath, uint32 id, const std::string &acquisitionDate) {
+    insets.push_back(Inset(rppath, id, acquisitionDate));
   }
 
   // Return the inset id for the most significant inset for the

earth_enterprise/src/fusion/rasterfuse/PackgenTraverserImpl.h

@@ -56,7 +56,11 @@ PackgenTraverser<Config>::PackgenTraverser(
        attribution != config.attributions.end(); ++attribution) {
     if (!attribution->dataRP.empty() &&
         (attribution->fuid_resource_ != 0)) {
-      attributions.AddInset(attribution->dataRP, attribution->fuid_resource_);
+      std::string acquisitionDate = kUnknownDateTimeUTC;
+      if (!attribution->acquisitionDate.empty()) {
+        acquisitionDate = attribution->acquisitionDate;
+      }
+      attributions.AddInset(attribution->dataRP, attribution->fuid_resource_, acquisitionDate);
     }
   }
 }

earth_enterprise/src/fusion/tools/gerasterpackupgrade.cpp

@@ -137,7 +137,8 @@ int main(int argc, char *argv[]) {
              attribution = config.attributions.begin();
            attribution != config.attributions.end(); ++attribution) {
         attributions.AddInset(attribution->dataRP,
-                              attribution->fuid_resource_);
+                              attribution->fuid_resource_,
+                              kUnknownDateTimeUTC);
       }
     }