Changeset 212 for Evidence/Evidence.cc

Timestamp:

05/25/10 07:38:03 (14 years ago)

Author:

ogrimm

Message:

Histories from DColl remain available if service is unavailable

File:

• Evidence/Evidence.cc (modified) (3 diffs)

Evidence/Evidence.cc

@@ -370 +370 @@
 }
 
-// Requests service history
+// Requests service history (returns true if data received OK)
 bool EvidenceHistory::GetHistory() {
 
   DimRpcInfo R((char *) "ServiceHistory", NO_LINK);
   R.setData((char *) Name.c_str());
+
+  // Check if data OK
   if (!EvidenceServer::ServiceOK(&R)) return false;
-
+  if (R.getSize() == 0) return false;
+  
+  // Copy data to buffer
   delete[] Buffer;
   BufferSize = R.getSize();
@@ -382 +386 @@
 
   memcpy(Buffer, R.getData(), BufferSize);
-  Offset = *(int *) Buffer;
+  Rewind();
   
   return true;
@@ -406 +410 @@
   return true;
 }
+
+// Reset to start of buffer
+void EvidenceHistory::Rewind() {
+
+  if (Buffer != NULL) Offset = *(int *) Buffer;
+}