Changeset 1589:b29fc8876204

Timestamp:

02/22/10 12:17:06 (5 months ago)

Author:

Howard Butler <hobu.inc@…>

Branch:

default

Message:

basic array insertion working

Location:

apps

Files:

• las2oci.cpp (modified) (12 diffs)
• oci_wrapper.cpp (modified) (7 diffs)
• oci_wrapper.h (modified) (2 diffs)

apps/las2oci.cpp

@@ -38 +38 @@
 #endif
 
-
+typedef struct
+    {
+        long* srid;
+        
+    } block;
+    
 bool KDTreeIndexExists(std::string& filename)
 {
@@ -76 +81 @@
     }
     return istrm;
+}
+
+bool EnableTracing(OWConnection* connection)
+{
+    ostringstream oss;
+// http://www.oracle-base.com/articles/10g/SQLTrace10046TrcsessAndTkprof10g.php
+    oss << "ALTER SESSION SET EVENTS '10046 trace name context forever, level 12'";
+
+    OWStatement* statement = 0;
+    
+    statement = connection->CreateStatement(oss.str().c_str());
+    
+    if (statement->Execute() == false) {
+        
+        std::cout << "statement execution failed "  << CPLGetLastErrorMsg() << std::endl;
+        delete statement;
+        return 0;
+    }    
 }
 
@@ -319 +342 @@
 }
 
-void GetElements(   OWStatement* statement,
+void SetElements(   OWStatement* statement,
                     OCIArray* sdo_elem_info, 
                     bool bUseSolidGeometry)
@@ -338 +361 @@
 }
 
-void GetOrdinates(   OWStatement* statement,
+void SetOrdinates(   OWStatement* statement,
                      OCIArray* sdo_ordinates, 
                      double x0, double x1, 
@@ -376 +399 @@
 
     ostringstream s_srid;
-    ostringstream s_gtype;
+    long gtype;
     ostringstream s_eleminfo;
     bool bGeographic = false;
     
-    if (srid == 0) {
-        s_srid << "NULL";
-        // bUse3d = true;
-        // bUseSolidGeometry = true;
-        }
-    else if (srid == 4326) {
-        // bUse3d = true;
-        // bUseSolidGeometry = true;
+    EnableTracing(connection);
+    
+    if (srid == 4326) {
         bGeographic = true;
-        s_srid << srid;
-        // s_srid << "NULL";
     }
     else {
@@ -402 +418 @@
     if (bUse3d) {
         if (bUseSolidGeometry == true) {
-            s_gtype << "3008";
-            s_eleminfo << "(1,1007,3)";
+            gtype = 3008;
 
         } else {
-            s_gtype << "3003";
-            s_eleminfo  << "(1,1003,3)";
-
+            gtype = 3003;
         }
     } else {
         if (bUseSolidGeometry == true) {
-            s_gtype << "2008";
-            s_eleminfo << "(1,1007,3)";
-
+            gtype = 2008;
         } else {
-            s_gtype << "2003";
-            s_eleminfo  << "(1,1003,3)";
-
+            gtype = 2003;
         }
     }
 
     double x0, x1, y0, y1, z0, z1;
-    double tolerance = 0.05;
     
 
@@ -446 +454 @@
         z0 = 0.0;
         z1 = 20000.0;
-        tolerance = 0.000000005;
     } else {
         z0 = 0.0;
@@ -453 +460 @@
     
         
-    // std::cout << "use 3d?: " << bUse3d << " srid: " << s_srid.str() << std::endl;
     oss_geom.setf(std::ios_base::fixed, std::ios_base::floatfield);
     oss_geom.precision(precision);
 
-//     oss_geom << "           mdsys.sdo_geometry("<<s_gtype.str() <<", "<<s_srid.str()<<", null,\n"
-// "              mdsys.sdo_elem_info_array"<< s_eleminfo.str() <<",\n"
-// "              mdsys.sdo_ordinate_array(\n";
-
-    oss_geom << "           mdsys.sdo_geometry(:5, :6, null,\n"
-"              mdsys.sdo_elem_info_array"<< s_eleminfo.str() <<",\n"
-"              mdsys.sdo_ordinate_array(\n";
-    oss_geom << x0 << ",\n" << y0 << ",\n";
-
-    if (bUse3d) {
-        oss_geom << z0 << ",\n";
-    }
-
-    oss_geom << x1 << ",\n" << y1 << "\n";
-
-    if (bUse3d) {
-        oss_geom << ",\n";
-        oss_geom << z1;
-    }
-
-    long result_id = result.GetID();
-    
-    oss_geom << "))";
     oss << "INSERT INTO "<< tableName << 
-            "(OBJ_ID, BLK_ID, NUM_POINTS, POINTS, BLK_EXTENT,  "
-            "PCBLK_MIN_RES, PCBLK_MAX_RES, NUM_UNSORTED_POINTS, PT_SORT_DIM) "
-            "VALUES ( :1, :2, :3, :4, " << oss_geom.str() << //:7, :8)" 
-            // << pc_id << "," << result.GetID() <<"," << num_points << ", " 
-            // << oss_geom.str() <<", :1"
-            ", 1, 1, 0, 1)";
-
-
-    // oss << "INSERT INTO "<< tableName << 
-    //         "(OBJ_ID, BLK_ID, NUM_POINTS, BLK_EXTENT, POINTS, "
-    //         "PCBLK_MIN_RES, PCBLK_MAX_RES, NUM_UNSORTED_POINTS, PT_SORT_DIM) "
-    //         "VALUES ( :1, :2, :3, " << oss_geom.str() <<
-    //         // << pc_id << "," << result.GetID() <<"," << num_points << ", " 
-    //          
-    //         ",:4, 1, 1, 0, 1)";
-
-
-            
+            "(OBJ_ID, BLK_ID, NUM_POINTS, POINTS,   "
+            "PCBLK_MIN_RES, BLK_EXTENT, PCBLK_MAX_RES, NUM_UNSORTED_POINTS, PT_SORT_DIM) "
+            "VALUES ( :1, :2, :3, :4, 1, mdsys.sdo_geometry(:5, :6, null,:7, :8)" 
+            ", 1, 0, 1)";
+          
     OWStatement* statement = 0;
     OCILobLocator** locator =(OCILobLocator**) VSIMalloc( sizeof(OCILobLocator*) * 1 );
@@ -535 +505 @@
 
     // :5
-    int gtype = atoi(s_gtype.str().c_str());
     long* p_gtype = (long*) malloc (1 * sizeof(long));
     p_gtype[0] = gtype;
 
-    printf("gtype: %d %d %s\n", *p_gtype, gtype, s_gtype.str().c_str());
     statement->Bind(p_gtype);
     
@@ -553 +521 @@
     
     // :7
-
     OCIArray* sdo_elem_info=0;
-    // connection->CreateType(sdo_elem_info, connection->GetElemInfoType());
-    // GetElements(statement, sdo_elem_info, bUseSolidGeometry);
-    
-    // statement->Bind(sdo_elem_info, connection->GetElemInfoType());
+    connection->CreateType(&sdo_elem_info, connection->GetElemInfoType());
+    SetElements(statement, sdo_elem_info, bUseSolidGeometry);    
+    statement->Bind(&sdo_elem_info, connection->GetElemInfoType());
     
     // :8
     OCIArray* sdo_ordinates=0;
-    // connection->CreateType(sdo_ordinates, connection->GetOrdinateType());
-    
-    // GetOrdinates(statement, sdo_ordinates, x0, x1, y0, y1, z0, z1, bUse3d);
-    // statement->Bind(sdo_ordinates, connection->GetOrdinateType());
+    connection->CreateType(&sdo_ordinates, connection->GetOrdinateType());
+    
+    SetOrdinates(statement, sdo_ordinates, x0, x1, y0, y1, z0, z1, bUse3d);
+    statement->Bind(&sdo_ordinates, connection->GetOrdinateType());
     
     if (statement->Execute() == false) {
@@ -649 +615 @@
     // }
     
+
     if (srid == 0) {
         s_srid << "NULL";
@@ -785 +752 @@
 }
 
+
+
 long CreatePCEntry( OWConnection* connection, 
                     LASQuery* query, 

apps/oci_wrapper.cpp

@@ -245 +245 @@
 }
 
-void OWConnection::CreateType( OCIArray* phData, OCIType* otype)
+void OWConnection::CreateType( OCIArray** phData, OCIType* otype)
 {
     CheckError( 
@@ -256 +256 @@
                         OCI_DURATION_SESSION,
                         FALSE, 
-                        (dvoid **)&phData)
+                        (dvoid **)phData)
                 , 
                 hError );
 }
 
-void OWConnection::DestroyType( OCIArray* phData )
+void OWConnection::DestroyType( OCIArray** phData )
 {
     CheckError( OCIObjectFree(
         hEnv,
         hError,
-        (OCIColl*) phData,
+        (OCIColl*) *phData,
         (ub2) 0), NULL );
 }
@@ -466 +466 @@
     if( nStmtType != OCI_STMT_SELECT )
     {
-        nStmtMode = OCI_COMMIT_ON_SUCCESS;
-        // nStmtMode = OCI_DEFAULT;
+        // nStmtMode = OCI_COMMIT_ON_SUCCESS;
+        nStmtMode = OCI_DEFAULT;
 
     }
@@ -648 +648 @@
 
     nNextBnd++;
-    printf("Binding blob column #: %d\n", nNextBnd);
     CheckError( OCIBindByPos( 
         hStmt,
@@ -831 +830 @@
 }
 
-void OWStatement::Bind( OCIArray* pphData, OCIType* type )
+void OWStatement::Bind( OCIArray** pphData, OCIType* type )
 {
     OCIBind* hBind = NULL;
@@ -857 +856 @@
         hError, 
         type, 
-        (dvoid **)&pphData, 
+        (dvoid **)pphData, 
         (ub4 *)0, 
         (dvoid **)0, 
@@ -1109 +1108 @@
 {
     OCINumber      oci_number;
-
-
+    
     CheckError(OCINumberFromInt(hError, (dvoid *)&nValue, 
         (uword)sizeof(ub4), OCI_NUMBER_UNSIGNED, 

apps/oci_wrapper.h

@@ -232 +232 @@
     void                DestroyType( sdo_geometry** pphData );
 
-    void                CreateType( OCIArray* phData , OCIType* type);
-    void                DestroyType( OCIArray* phData );
+    void                CreateType( OCIArray** phData , OCIType* type);
+    void                DestroyType( OCIArray** phData );
 
     OCIType*            DescribeType( char *pszTypeName );
@@ -296 +296 @@
     void                Bind( double* pnData );
     void                Bind( char* pData, long nData);
-    void                Bind( OCIArray* pphData, OCIType* type );
+    void                Bind( OCIArray** pphData, OCIType* type );
     
     void                Define( double* pnData );