Changeset 1592:bdc2854f7e5a

Timestamp:

02/23/10 08:30:48 (5 months ago)

Author:

Howard Butler <hobu.inc@…>

Branch:

default

Message:

transaction and commit support

Location:

apps

Files:

• las2oci.cpp (modified) (10 diffs)
• oci_wrapper.cpp (modified) (1 diff)
• oci_wrapper.h (modified) (1 diff)

apps/las2oci.cpp

@@ -435 +435 @@
     return e;    
 }
+blocks* CreateBlock(int size)
+{
+    blocks* b = (blocks*) malloc( sizeof(blocks));
+    
+    b->pc_ids = (long*) malloc( size * sizeof(long));
+    b->block_ids = (long*) malloc ( size * sizeof(long));
+    b->num_points = (long*) malloc ( size * sizeof(long));
+    b->blobs = (std::vector<liblas::uint8_t>**) malloc ( size * sizeof(std::vector<liblas::uint8_t>*));
+
+    b->srids = (long*) malloc ( size * sizeof(long));
+    b->gtypes = (long*) malloc ( size * sizeof(long));
+
+    b->element_arrays = (OCIArray**) malloc ( size * sizeof(OCIArray*));
+    b->coordinate_arrays = (OCIArray**) malloc ( size * sizeof(OCIArray*));
+   
+}
 bool FillBlock( OWConnection* connection, 
                 OWStatement* statement,
@@ -441 +457 @@
                 blocks* b,
                 long index,
-                
                 int srid, 
                 long pc_id,
@@ -450 +465 @@
                 bool bUse3d,
                 long nDimensions
-                
               )
 {
@@ -479 +493 @@
     OCIArray* sdo_ordinates=0;
     connection->CreateType(&sdo_ordinates, connection->GetOrdinateType());
-    
-    extent* e = (extent*) malloc(sizeof(extent));
+
+
+    bool bGeographic = false;
+    
+    if (srid == 4326) {
+        bGeographic = true;
+    }
+    else {
+        // s_srid << srid;
+        // bUse3d = false;
+        // If the user set an srid and set it to solid, we're still 3d
+        // if (bUseSolidGeometry == true)
+        //     bUse3d = true;
+    }
+        
+    extent* e = GetExtent(result, bUse3d, bGeographic);
     SetOrdinates(statement, sdo_ordinates, e);
 
@@ -524 +552 @@
     list<SpatialIndex::id_type> const& ids = result.GetIDs();
     const SpatialIndex::Region* b = result.GetBounds();
-    liblas::uint32_t num_points =ids.size();
-
-
-    long gtype = GetGType(bUse3d, bUseSolidGeometry);
+    liblas::uint32_t num_points = ids.size();
 
 
@@ -545 +570 @@
     }
 
-
-    double x0, x1, y0, y1, z0, z1;
-    
-
-    x0 = b->getLow(0);
-    x1 = b->getHigh(0);
-    y0 = b->getLow(1);
-    y1 = b->getHigh(1);
-    
-    if (bUse3d) {
-        try {
-            z0 = b->getLow(2);
-            z1 = b->getHigh(2);
-        } catch (Tools::IndexOutOfBoundsException& e) {
-            z0 = 0;
-            z1 = 20000;
-        }
-    } else if (bGeographic) {
-        x0 = -180.0;
-        x1 = 180.0;
-        y0 = -90.0;
-        y1 = 90.0;
-        z0 = 0.0;
-        z1 = 20000.0;
-    } else {
-        z0 = 0.0;
-        z1 = 20000.0;            
-    }
-    
-        
-    // oss_geom.setf(std::ios_base::fixed, std::ios_base::floatfield);
-    // oss_geom.precision(precision);
+    long gtype = GetGType(bUse3d, bUseSolidGeometry);
 
     oss << "INSERT INTO "<< tableName << 
@@ -626 +620 @@
     
     // :6
-    
     long* p_srid  = 0;
     
@@ -664 +657 @@
 
     delete statement;
-
-
     
     return true;
@@ -1075 +1066 @@
         return 0;
     }
+    
+    connection->Commit();
     output = *pc_id;
     
@@ -1428 +1421 @@
     }
 
+    con->StartTransaction();
 
     std::istream* istrm;

apps/oci_wrapper.cpp

@@ -408 +408 @@
 }
 
+bool OWConnection::StartTransaction()
+{
+    CheckError( OCITransStart (
+        hSvcCtx,
+        hError,
+        (uword) 30,
+        OCI_TRANS_NEW), 
+    hError );   
+    
+    return true;
+}
+
+bool OWConnection::Commit()
+{
+    CheckError( OCITransCommit (
+        hSvcCtx,
+        hError,
+        OCI_DEFAULT), 
+    hError );
+    
+    return true;
+}
+
 /*****************************************************************************/
 /*                           OWStatement                                     */

apps/oci_wrapper.h

@@ -249 +249 @@
     OCIType*            GetElemInfoType() {return hElemArrayTDO; }
     OCIType*            GetOrdinateType() {return hOrdinateArrayTDO; }
+    
+    bool                Commit(); // OCITransCommit() 
+    bool                StartTransaction(); //  //OCITransStart()
+    bool                EndTransaction() {Commit(); } 
 
 };