few fixes in TableBlockStorage and CycleStorage

Utilities/JrnTests/JrnTest.cc

@@ -224,7 +224,6 @@ void testJournal2(void)
 	delete j;
 }
 
-
 int main(int args, char **argv)
 {
 	//testTable1();

include/Storages.h

@@ -30,6 +30,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <string>
 
 #include "UniXML.h"
 
@@ -100,9 +101,6 @@ class TableBlockStorage
 		bool KeyCompare(int i, void* key);
 		void* KeyPointer(int num);
 		void* ValPointer(int num);
-	/*public:
-		FILE *file;
-		int cur_block,inf_size;*/
 };
 
 class CycleStorage

src/Various/CycleStorage.cc

@@ -28,10 +28,6 @@
 	       
 */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
 #include "Storages.h"
 
 CycleStorage::CycleStorage()
@@ -86,7 +82,7 @@ bool CycleStorage::Open(const char* name, int inf_sz, int sz, int seek)
 		return false;
 	}
 
-	if((csa->size!=((sz-sizeof(CycleStorageAttr))/(sizeof(CycleStorageElem)+inf_sz)))||(csa->inf_size!=inf_sz)||(csa->seekpos!=seek)) 
+	if((csa->size!=((sz-sizeof(CycleStorageAttr))/(sizeof(CycleStorageElem)+inf_sz)))||(csa->inf_size!=inf_sz)||(csa->seekpos!=seek))
 	{
 		delete csa;
 		return false;
@@ -350,7 +346,9 @@ bool CycleStorage::DelAllRows()
 void* CycleStorage::ViewRow(int num, void* str)
 {
 	int j=(head+num)%size;
-	if((file==NULL)||(num>size)) return 0;
+	if((file==NULL)||(num>=size)) return 0;
+
+	if((head!=tail+1)&&(num>tail)) return 0;
 	CycleStorageElem *jrn = (CycleStorageElem*)new char[full_size];
 	fseek(file,seekpos+j*full_size,0);
 	fread(jrn,full_size,1,file);

src/Various/TableBlockStorage.cc

@@ -28,10 +28,6 @@
 	  ,   ,     
 */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
 #include "Storages.h"
 
 #define block_begin -5
@@ -318,7 +314,7 @@ void* TableBlockStorage::FindKeyValue(void* key, void* val)
 				return val;
 			}
 	}
-	return false;
+	return 0;
 }
 
 int TableBlockStorage::GetCurBlock()