Changeset 31387 for main/trunk/greenstone2/runtime-src/src/colservr/source.h

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/source.h (modified) (4 diffs)

main/trunk/greenstone2/runtime-src/src/colservr/source.h

@@ -62 +62 @@
   text_t db_filename;
   dbclass *db_ptr;
+  text_t oaidb_filename;
+  dbclass *oaidb_ptr;
 
   searchclass *textsearchptr;
@@ -69 +71 @@
   virtual ~sourceclass ();
 
-  // the DB ptr remains the responsibility of the calling code
+  // the DB ptrs remain the responsibility of the calling code
+  // but as the db_ptr is deleted by this source object, the oaidb_ptr will be deleted by this object too
   void set_db_ptr (dbclass *db_ptr_arg) { db_ptr = db_ptr_arg; }
+  void set_oaidb_ptr (dbclass *oaidb_ptr_arg) { oaidb_ptr = oaidb_ptr_arg; }
 
   // the textsearchptr remains the responsibility of the calling code
@@ -86 +90 @@
                   comerror_t &err, ostream &logout);
 
-  // get_metadata fills out the metadata if possible, if it is not responsable
-  // for the given OID then it will return false.
+  // get_metadata fills out the metadata if possible.
+  // If it is not responsible for the given OID then it will return false.
   virtual bool get_metadata (const text_t &requestParams, const text_t &refParams, 
                  bool getParents, const text_tset &fields,
                  const text_t &OID, MetadataInfo_tmap &metadata, 
-                 comerror_t &err, ostream &logout);
+                 comerror_t &err, ostream &logout, bool append);
+
+  // get_oai_metadata fills out the metadata from the oai_db if possible
+  // if it is not responsible for the given OID then it will return false.
+  virtual bool get_oai_metadata (const text_t &requestParams, const text_t &refParams, 
+                 bool getParents, const text_tset &fields,
+                 const text_t &OID, text_t &deleted_status,
+                 MetadataInfo_tmap &metadata, comerror_t &err, ostream &logout);
 
   virtual bool get_document (const text_t &OID, text_t &doc, 
@@ -101 +112 @@
   text_t resolve_db_filename(const text_t& idx,
                  const text_t& file_ext);
+  text_t resolve_oaidb_filename(const text_t& file_ext);
+  text_t getcollectionpath();
 
 };