greenstone.org greenstone wiki greenstone trac planet greenstone

Changeset 15380

Show
Ignore:
Timestamp:
2008-05-09 15:12:02 (3 months ago)
Author:
mdewsnip
Message:

Three fixes to the resumption token code to prevent crashes when specifying a set that isn't at collection-level. By DL Consulting Ltd.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • gsdl/trunk/src/oaiservr/abstractlistaction.cpp

    r15198 r15380  
    404404      } 
    405405    } 
     406 
     407    // We need to subtract one from the startPos value to turn it into an index value 
     408    startPos--; 
    406409  } 
    407410   
    …… 
    440443 
    441444    if (this->outputDocs == this->configuration->resumeAfter()) { 
    442       //      this->replyToken = new ResumptionToken(collection, params["set"], ""); 
    443       this->replyToken = resumptionToken; 
     445      this->replyToken = new ResumptionToken(collection, params["set"], ""); 
    444446      this->replyToken->setPosition(classifier, c+2);       
    445     } 
    446   } 
    447 } 
    448  
    449  
    450  
    451  
     447      break; 
     448    } 
     449  } 
     450} 
     451 
     452 
     453 
     454 

  • gsdl/trunk/src/oaiservr/resumptiontoken.cpp

    r11760 r15380  
    5656 
    5757  if (second != here) { 
     58    // get past the '.' 
     59    ++second; 
    5860    this->browseNode = substr(second, here); 
    5961  }