X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=book.c;h=893dee88ac84f2214549756623e47357af1478c4;hb=259aca883470b6cd7fc47e417475f05120400d3c;hp=4f389acb04d591276101184730db100dc7515310;hpb=35467b2a732c657950558ace3007a07ca1270384;p=xboard.git

diff --git a/book.c b/book.c
index 4f389ac..893dee8 100644
--- a/book.c
+++ b/book.c
@@ -37,6 +37,15 @@
 #include "common.h"
 #include "backend.h"
 #include "moves.h"
+#include "gettext.h"
+
+#ifdef ENABLE_NLS
+# define  _(s) gettext (s)
+# define N_(s) gettext_noop (s)
+#else
+# define  _(s) (s)
+# define N_(s)  s
+#endif
 
 #ifdef _MSC_VER
   typedef unsigned __int64 uint64;
@@ -44,7 +53,6 @@
   typedef unsigned long long int uint64;
 #endif
 
-
 #ifdef _MSC_VER
 #  define U64(u) (u##ui64)
 #else
@@ -278,6 +286,23 @@ uint64 hash(int moveNr)
 {
     int r, f, p_enc, squareNr, pieceGroup;
     uint64 key=0, holdingsKey=0, Zobrist;
+    VariantClass v = gameInfo.variant;
+
+    switch(v) {
+	case VariantNormal:
+	case VariantFischeRandom: // compatible with normal
+	case VariantNoCastle:
+	case VariantXiangqi: // for historic reasons; does never collide anyway because of other King type
+	    break;
+	case VariantGiveaway: // in opening same as suicide
+	    key += VariantSuicide;
+	    break;
+	case VariantGothic: // these are special cases of CRC, and can share book
+	case VariantCapablanca:
+	    v = VariantCapaRandom;
+	default:
+	    key += v; // variant type incorporated in key to allow mixed books without collisions
+    }
 
     for(f=0; f<BOARD_WIDTH; f++){
         for(r=0; r<BOARD_HEIGHT;r++){
@@ -468,7 +493,8 @@ void move_to_string(char move_s[6], uint16 move)
 
 int GetBookMoves(int moveNr, char *book, entry_t entries[])
 {   // retrieve all entries for given position from book in 'entries', return number.
-    FILE *f;
+    static FILE *f = NULL;
+    static char curBook[MSG_SIZ];
     entry_t entry;
     int offset;
     uint64 key;
@@ -477,9 +503,13 @@ int GetBookMoves(int moveNr, char *book, entry_t entries[])
 
     if(book == NULL || moveNr >= 2*appData.bookDepth) return -1; 
 //    if(gameInfo.variant != VariantNormal) return -1; // Zobrist scheme only works for normal Chess, so far
-    f=fopen(book,"rb");
+    if(!f || strcmp(book, curBook)){ // keep book file open until book changed
+	strncpy(curBook, book, MSG_SIZ);
+	if(f) fclose(f);
+	f = fopen(book,"rb");
+    }
     if(!f){
-	DisplayError("Polyglot book not valid", 0);
+        DisplayError(_("Polyglot book not valid"), 0);
 	appData.usePolyglotBook = FALSE;
 	return -1;
     }
@@ -489,7 +519,6 @@ int GetBookMoves(int moveNr, char *book, entry_t entries[])
 
     offset=find_key(f, key, &entry);
     if(entry.key != key) {
-	  fclose(f);
 	  return FALSE;
     }
     entries[0] = entry;
@@ -506,7 +535,6 @@ int GetBookMoves(int moveNr, char *book, entry_t entries[])
         if(count == MOVE_BUF) break;
         entries[count++] = entry;
     }
-    fclose(f);
     return count;
 }
 
@@ -541,7 +569,7 @@ char *ProbeBook(int moveNr, char *book)
         total_weight += entries[i].weight;
 	if(total_weight > j) break;
     }
-    if(i >= count) DisplayFatalError("Book Fault", 0, 1); // safety catch, cannot happen
+    if(i >= count) DisplayFatalError(_("Book Fault"), 0, 1); // safety catch, cannot happen
     move_to_string(move_s, entries[i].move);
     if(appData.debugMode) fprintf(debugFP, "book move field = %d\n", entries[i].move);
 
@@ -655,10 +683,10 @@ void SaveToBook(char *text)
     FILE *f;
     if(!count && !currentCount) return;
     f=fopen(appData.polyglotBook, "rb+");
-    if(!f){	DisplayError("Polyglot book not valid", 0); return; }
+    if(!f){	DisplayError(_("Polyglot book not valid"), 0); return; }
     offset=find_key(f, entries[0].key, &entry);
     if(entries[0].key != entry.key && currentCount) {
-	  DisplayError("Hash keys are different", 0);
+          DisplayError(_("Hash keys are different"), 0);
 	  fclose(f);
 	  return;
     }
@@ -673,8 +701,10 @@ void SaveToBook(char *text)
     if(count != currentCount) {
 	do {
 	    for(i=0; i<len1; i++) buf2[i] = buf1[i]; len2 = len1;
-	    fseek(f, readpos, SEEK_SET);
-	    readpos += len1 = fread(buf1, 1, 4096, f);
+	    if(readpos > writepos) {
+		fseek(f, readpos, SEEK_SET);
+		readpos += len1 = fread(buf1, 1, 4096, f);
+	    } else len1 = 0; // wrote already past old EOF
 	    fseek(f, writepos, SEEK_SET);
 	    fwrite(buf2, 1, len2, f);
 	    writepos += len2;