Ticket #267: 0001-provisional-patch-adding-tiling-support-to-rasimport.patch

applications/rasgeo/RasdamanHelper2.cxx

@@ -480 +480 @@
 
 double RasdamanHelper2::insertImage(std::string collname,
                                     char* buf, r_Point& shift, r_Minterval& sdom, bool bRowMajor2ColMajor,
-                                    std::string marraytypename)
+                                    std::string marraytypename, std::string tiling)
 {
     NMDebugCtx(ctxrhelper, << "...");
 
@@ -532 +532 @@
         }
     }
 
+    // if the specified tiling string is not empty, we just append it to the insert query
+    // string - we rely on r_oql to throw an execption, if anything is wrong ...
+    if (!tiling.empty())
+    {
+        qstr += " " + tiling;
+    }
+
     NMDebugAI( << "dummy grid query: " << qstr << std::endl);
 
     r_OQL_Query qins(qstr.c_str());

applications/rasgeo/RasdamanHelper2.h

@@ -148 +148 @@
     /*! insert an image into the collection */
     double insertImage(std::string collname, char* buf,
                        r_Point& shift, r_Minterval& sdom, bool bRowMajor2ColMajor,
-                       std::string marraytypename = "");
+                       std::string marraytypename, std::string tiling);
 
     /*! update an already present image in the collection */
     void updateImage(std::string collname, double imgid,
                      char* buf, r_Point& shift, r_Minterval& sdom, bool bRowMajor2ColMajor,
-                     std::string marraytypename = "")
+                     std::string marraytypename)
     throw (r_Error);
 
 

applications/rasgeo/rimport.cxx

@@ -461 +461 @@
 processImageFiles(vector<string>& filenames, string collname,
                   vector<double>& oids, Header& processRegion,
                   string mode3D, r_Point& shiftPt, RasdamanHelper2& helper,
-                  std::string marraytypename)
+                  std::string marraytypename, std::string tiling)
 {
     /* PROCEDURE
      * - read source geospatial region (srcGeoRegion)
@@ -678 +678 @@
         printRegion(newGeoRegion, "newGeoRegion");
 
         importImage(helper, pDs, collname, oids, readGDALImgDOM, writeShift,
-                    newGeoRegion, b3D, marraytypename);
+                    newGeoRegion, b3D, marraytypename, tiling);
 
         // release data set
         GDALClose(pDs);
@@ -709 +709 @@
 
 int importImage(RasdamanHelper2& helper, GDALDataset* pDs, string& collname, vector<double>& oids,
                 r_Minterval& readGDALImgDOM, r_Point& writeShift, Header& newGeoRegion,
-                bool asCube, std::string marraytypename)
+                bool asCube, std::string marraytypename, std::string tiling)
 {
     NMDebugCtx(ctxRimport, << "...");
 
@@ -791 +791 @@
 
                 if (iter == 0 && oids.size() < b)
                     oids.push_back(helper.insertImage(collname, (char*)gdalbuf, seqWriteShift, rint, true,
-                                                      marraytypename));
+                                                      marraytypename, tiling));
                 else
                     helper.updateImage(collname, oids[b-1], (char*)gdalbuf, seqWriteShift, rint, true,
                                        marraytypename);
@@ -810 +810 @@
                 if (iter == 0 && oids.size() == 0)
                 {
                     oids.push_back(helper.insertImage(collname, (char*)gdalbuf, seqWriteShift, rint, true,
-                                                      marraytypename));
+                                                      marraytypename, tiling));
                 }
                 else
                 {
@@ -1068 +1068 @@
     std::string collname;                                        // -coll
     std::string connfile;                                        // -conn
     std::string mode3D;                                          // -3D
+    std::string tilingSpec;                                                                              // -tiling
 
     double cellsizez = -1;                                       // -csz
     std::vector<double> bnd;                                     // -bnd
@@ -1203 +1204 @@
                 return EXIT_FAILURE;
             }
         }
+        else if (theArg == "-tiling")
+        {
+                tilingSpec = argv[arg+1];
+        }
         else if (theArg == "--help")
         {
             showHelp();
@@ -1241 +1246 @@
         NMDebug(<< usertype.at(t) << " ");
     NMDebug(<< std::endl);
 
+    NMDebugInd(1, << "tiling scheme: " << tilingSpec << std::endl);
+
     // -----------------------------------------------------------------------
     // EVALUATE ARGUMENTS
     // get the connection file and check readability
@@ -1353 +1360 @@
             marraytypename = usertype.at(0);
 
         if (!processImageFiles(vimportnames, collname, oids, header, mode3D,
-                               shiftPt, helper, marraytypename))
+                               shiftPt, helper, marraytypename, tilingSpec))
         {
             NMErr(ctxRimport, << "Failed processing image file(s)!");
             return EXIT_FAILURE;

applications/rasgeo/rimport.h

@@ -133 +133 @@
 
 int importImage(RasdamanHelper2& helper, GDALDataset* pDs, string& collname, vector<double>& oids,
                 r_Minterval& readGDALImgDOM, r_Point& writeShift, Header& newGeoRegion,
-                bool asCube, std::string marraytypename = "");
+                bool asCube, std::string marraytypename, string tiling);
 
 int processImageFiles(vector<string>& filenames, string collname, vector<double>& oids,
                       Header& processRegion, string mode3D, r_Point& shiftPt, RasdamanHelper2& helper,
-                      std::string marraytypename = "");
+                      std::string marraytypename, string tiling);
 
 void intersectRegions2D(Header& inoutRegion, Header& intersectRegion);
 void intersectRegions2D(Header& inoutRegion, std::vector<double>& intersectRegions);