Changeset 20590 for gsdl/trunk/runtime-src/src/oaiservr/resumptiontoken.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/resumptiontoken.h (modified) (1 diff)

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

@@ -2 +2 @@
 #define _RESUMPTIONTOKEN_H_
 
-#include <vector>
-
 #include "text_t.h"
 
-// use the standard namespace
-#if !defined (GSDL_NAMESPACE_BROKEN)
-#if defined(GSDL_USE_OBJECTSPACE)
-using namespace ospace::std;
-#else
-using namespace std;
-#endif
-#endif
 
 class ResumptionToken
-{ private:
-  text_t  collection;
-  text_t  browseNode;
-  vector<int> browsePosition;
-  int     startItem;
-  text_t  buildDate;
-  // TODO: add a server name to the variables list; see getToken in resumptionToken.cpp
+{
+ private:
+  text_t build_date;
+  text_t set;
+  text_t metadata_prefix;
+  text_t from;
+  text_t until;
+  text_t position;
+
+  bool valid;
 
  public:
-  ResumptionToken(const text_t &collection, const text_t &rootNode, const text_t &buildDate);
-  ResumptionToken(const text_t &URN);
-  text_t  getToken();
+  ResumptionToken(const text_t &build_date, const text_t &set, const text_t &metadata_prefix,
+          const text_t &from, const text_t &until, const text_t &position);
+  ResumptionToken(const text_t &resumption_token_string);
 
-  void setPosition(const text_t &node, int startItem);
+  text_t getBuildDate() { return build_date; }
+  text_t getSet() { return set; }
+  text_t getMetadataPrefix() { return metadata_prefix; }
+  text_t getFrom() { return from; }
+  text_t getUntil() { return until; }
+  text_t getPosition() { return position; }
 
-  text_t  getCollection() { return collection; }
-  text_t  getNode() { return browseNode; }
-  int     getPosition() { return startItem; }
-  int     getOffsetDepth() { return this->browsePosition.size(); }
-  void    setOffset(int depth, int position) { this->browsePosition[depth] = position; }
-  int getOffset(int offset) { return this->browsePosition[offset]; }
+  text_t getResumptionTokenString();
   bool isValid();
 };
 
+
 #endif