Changeset 20590 for gsdl/trunk/runtime-src/src/oaiservr/abstractlistaction.h

Timestamp:

2009-09-11T11:54:17+12:00 (15 years ago)

Author:

mdewsnip

Message:

Completely rewrote the resumption token support, as its buginess finally tipped the "I can't stand it any more" scale...

File:

• gsdl/trunk/runtime-src/src/oaiservr/abstractlistaction.h (modified) (1 diff)

gsdl/trunk/runtime-src/src/oaiservr/abstractlistaction.h

@@ -8 +8 @@
 { 
  public:
-  abstractlistaction(const text_t &name) : oaiaction(name) {this->prevDocSeen = false;}
+  abstractlistaction(const text_t &name) : oaiaction(name) { }
+
   virtual bool output_document(ostream &output, recptproto *protocol, const text_t &collection, 
                    const text_t &OID, const text_t &metadataPrefix) = 0;
+
   virtual bool output_content(ostream &output, recptproto *protocol, oaiargs &params);
-  virtual void output_content_for_all(ostream &output, recptproto *protocol, oaiargs &params);
-  virtual void output_content_for_col(ostream &output, recptproto *protocol, text_t &gsdlCollect, 
-                      ColInfoResponse_t &cinfo, comerror_t &err, oaiargs &params);
-  virtual void recurse_set(ostream &output, recptproto *protocol, const text_t &collection, 
-               const text_t &classifier, oaiargs &params, ResumptionToken *resumptionToken);
+
+  virtual bool output_content_for_set(ostream &output, recptproto *protocol, oaiargs &params, text_t collection_name, text_t gsdl_classifier_OID, text_t set_name);
+
+
  protected:
-  bool prevDocSeen;
-  int  outputDocs;
-  ResumptionToken *replyToken;
-  bool check_classifier(recptproto *protocol, const text_t &collection, const text_t &classifier);
+  int output_docs;
+
+  bool check_classifier(recptproto *protocol, const text_t &collection, const text_t &set_name);
+
+  bool in_date_range(ostream &output, recptproto *protocol, oaiargs &params,
+             text_t& collection, text_t oai_OID, text_t from, text_t until);
 };
+
 #endif