Changeset 31387 for main/trunk/greenstone2/runtime-src/src/colservr/collectset.cpp

Timestamp:

2017-02-08T18:31:18+13:00 (7 years ago)

Author:

ak19

Message:

Round 1 of commits for getting OAI deletion policy to work with GS2 (server end). The perl code writing out the OAI db and the GS3 server code implementing the deletion policy had already been completed earlier (end 2016).

File:

• main/trunk/greenstone2/runtime-src/src/colservr/collectset.cpp (modified) (9 diffs)

main/trunk/greenstone2/runtime-src/src/colservr/collectset.cpp

@@ -335 +335 @@
 
     // Create a dbclass of the correct type
-    dbclass *db_ptr = NULL;
+    dbclass *db_ptr = NULL; // index database in index/text
+    dbclass *oaidb_ptr = NULL; // etc/oai-inf database
 
     if (infodbtype == "sqlite")
@@ -342 +343 @@
     sqlitedbclass *sql_db_ptr = new sqlitedbclass(gsdlhome);
     db_ptr = sql_db_ptr;
+
+    sqlitedbclass *sql_oaidb_ptr = new sqlitedbclass(gsdlhome);
+    oaidb_ptr = sql_oaidb_ptr;
 
     // add a sql browse filter
@@ -364 +368 @@
     mssqldbclass *mssql_db_ptr = new mssqldbclass(gsdlhome);
     db_ptr = mssql_db_ptr;
+
+    mssqldbclass *mssql_oaidb_ptr = new mssqldbclass(gsdlhome);
+    oaidb_ptr = mssql_oaidb_ptr;
 
     // add a sql browse filter
@@ -380 +387 @@
     jdbmnaiveclass *jdbm_db_ptr = new jdbmnaiveclass(gsdlhome);
     db_ptr = jdbm_db_ptr;
+
+    jdbmnaiveclass *jdbm_oaidb_ptr = new jdbmnaiveclass(gsdlhome);
+    oaidb_ptr = jdbm_oaidb_ptr;
 #else
     cerr << "Warning: infodbtype of 'jdbm' was not compiled in to " << endl;
@@ -392 +402 @@
 #ifdef USE_GDBM
       db_ptr = new gdbmclass(gsdlhome);
+      oaidb_ptr = new gdbmclass(gsdlhome);
 #else
     cerr << "Warning: infodbtype of 'gdbm' was not compiled in to " << endl;
@@ -405 +416 @@
     browsefilterclass *browsefilter = new browsefilterclass();
     browsefilter->set_db_ptr(db_ptr);
+    // set the oaidb ptr for the browse filter. As with the db_ptr, the oaidb_ptr
+    // is not managed and deleted by the browsefilter class, but by the sourceclass
+    browsefilter->set_oaidb_ptr(oaidb_ptr);
     cserver->add_filter (browsefilter);  
 
@@ -420 +434 @@
       mgsourceclass *mgsource = new mgsourceclass ();
       mgsource->set_db_ptr(db_ptr);
+      mgsource->set_oaidb_ptr(oaidb_ptr);
       mgsource->set_textsearchptr (mgsearch);
       cserver->add_source (mgsource);
@@ -439 +454 @@
       mgppsourceclass *mgppsource = new mgppsourceclass ();
       mgppsource->set_db_ptr(db_ptr);
+      mgppsource->set_oaidb_ptr(oaidb_ptr);
       mgppsource->set_textsearchptr (mgppsearch);
       cserver->add_source (mgppsource);
@@ -459 +475 @@
       lucenesourceclass *lucenesource = new lucenesourceclass ();
       lucenesource->set_db_ptr(db_ptr);
+      lucenesource->set_oaidb_ptr(oaidb_ptr);
       lucenesource->set_textsearchptr (lucenesearch);
       cserver->add_source (lucenesource);