src fixes

chatscriptnlp · chatscriptnlp · commit 305a3aec07a5 · 2020-07-20T17:09:51.000+01:00
diff --git a/SRC/csocket.cpp b/SRC/csocket.cpp
@@ -469,7 +469,7 @@ static void Jmetertestfile(bool api,char* bot, char* sendbuffer, char* response,
 		// now execute conversation
 		while (*input)
 		{
-			strcpy(sendbuffer + baselen + 1, input);
+			strcpy(sendbuffer + baselen, input);
 			sock = new TCPSocket(serverIP, (unsigned short)port);
 			sock->send(sendbuffer, baselen + 1 + strlen(input));
 			ReadSocket(sock, response);
@@ -525,14 +525,14 @@ static void Jmetertestfile(bool api,char* bot, char* sendbuffer, char* response,
 			if (strcmp(actual, expect))
 			{
 				++failcnt;
-				fprintf(out, "@%d %s  P/F: %d/%d   %s:%s %s:%s Input: %s\r\n", line, bot, passcnt, failcnt, category, specialty, chattype, source, at);
+				fprintf(out, "@%d %s  P/F: %d/%d   %s:%s %s:%s Input: %s\r\n", line, bot, passcnt, failcnt, category, specialty, chattype, source, input);
 				fprintf(out, "want: %s\r\n", expect);
 				fprintf(out, "gotx: %s|        %s\r\n\r\n", actual, response);
 			}
 			else
 			{
 				++passcnt;
-				fprintf(out, "@%d %s  P/F: %d/%d   %s:%s  Input: %s  Output:%s \r\n\r\n", line, bot, passcnt, failcnt, category, specialty, at, actual);
+				fprintf(out, "@%d %s  P/F: %d/%d   %s:%s  Input: %s  Output:%s \r\n\r\n", line, bot, passcnt, failcnt, category, specialty, input, actual);
 			}
 			if (((passcnt + failcnt) % 100) == 0) printf("at %d  pass:%d fail:%d\r\n", passcnt + failcnt, passcnt, failcnt);
 			if (!ptr) break; // end of messages
diff --git a/SRC/mainSystem.cpp b/SRC/mainSystem.cpp
@@ -7,6 +7,7 @@ bool fastload = true;
 int externalTagger = 0;
 char defaultbot[100];
 uint64 chatstarted = 0;
+bool client = false;
 uint64 preparationtime = 0;
 uint64 replytime = 0;
 unsigned int timeLog = 2147483647;
@@ -821,6 +822,7 @@ static void ProcessArgument(char* arg)
 	else if (!strnicmp(arg,(char*)"client=",7)) // client=1.2.3.4:1024  or  client=localhost:1024
 	{
 		server = false;
+		client = true;
 		char buffer[MAX_WORD_SIZE];
 		strcpy(serverIP,arg+7);
 		
@@ -2123,12 +2125,12 @@ int PerformChat(char* user, char* usee, char* incoming,char* ip,char* output) //
 
 	mainInputBuffer = SkipWhitespace(incoming);
 	mainOutputBuffer = output;
-	strcpy(realinput, mainInputBuffer);
 	char* oobSkipped = SkipOOB(mainInputBuffer);
 	if (server)
 	{
 		AdjustUTF8(oobSkipped, oobSkipped - 1); // not needed coming locally - handle user stuff
 	}
+	strcpy(realinput, mainInputBuffer);
 	bool eraseUser = false;
 
 	// accept a user topic file erase command
diff --git a/SRC/mainSystem.h b/SRC/mainSystem.h
@@ -86,6 +86,7 @@ extern bool sentenceOverflow;
 extern char treetaggerParams[200];
 extern unsigned short int derivationIndex[256];
 extern int derivationLength;
+extern bool client;
 extern char* derivationSentence[MAX_SENTENCE_LENGTH];
 extern bool docstats;
 extern unsigned int docSentenceCount;
diff --git a/SRC/os.cpp b/SRC/os.cpp
@@ -213,7 +213,7 @@ void myexit(char* msg, int code)
 	if (code == 0) fprintf(in, (char*)"CS exited at %s\r\n", GetTimeInfo(&ptm, true));
 	else fprintf(in, (char*)"CS terminated at %s\r\n", GetTimeInfo(&ptm, true));
 	FClose(in);
-	CloseSystem();
+	if (!client) CloseSystem();
 	exit((code == 0) ? EXIT_SUCCESS : EXIT_FAILURE);
 }
 
diff --git a/SRC/textUtilities.cpp b/SRC/textUtilities.cpp
@@ -2172,6 +2172,10 @@ bool AdjustUTF8(char* start,char* buffer)
 				}
 				buffer = x - 1; // valid utf8
 			}
+			else if (*buffer == 0x92) // windows smart quote not real unicode
+			{
+				*buffer = '\''; 
+			}
 			else // invalid utf8
 			{
 				hasbadutf = true;

Original file line number	Diff line number	Diff line change
`@@ -469,7 +469,7 @@ static void Jmetertestfile(bool api,char* bot, char* sendbuffer, char* response,`
`469`	`469`	`// now execute conversation`
`470`	`470`	`while (*input)`
`471`	`471`	`{`
`472`		`- strcpy(sendbuffer + baselen + 1, input);`
	`472`	`+ strcpy(sendbuffer + baselen, input);`
`473`	`473`	`sock = new TCPSocket(serverIP, (unsigned short)port);`
`474`	`474`	`sock->send(sendbuffer, baselen + 1 + strlen(input));`
`475`	`475`	`ReadSocket(sock, response);`
`@@ -525,14 +525,14 @@ static void Jmetertestfile(bool api,char* bot, char* sendbuffer, char* response,`
`525`	`525`	`if (strcmp(actual, expect))`
`526`	`526`	`{`
`527`	`527`	`++failcnt;`
`528`		`- fprintf(out, "@%d %s P/F: %d/%d %s:%s %s:%s Input: %s\r\n", line, bot, passcnt, failcnt, category, specialty, chattype, source, at);`
	`528`	`+ fprintf(out, "@%d %s P/F: %d/%d %s:%s %s:%s Input: %s\r\n", line, bot, passcnt, failcnt, category, specialty, chattype, source, input);`
`529`	`529`	`fprintf(out, "want: %s\r\n", expect);`
`530`	`530`	`fprintf(out, "gotx: %s\| %s\r\n\r\n", actual, response);`
`531`	`531`	`}`
`532`	`532`	`else`
`533`	`533`	`{`
`534`	`534`	`++passcnt;`
`535`		`- fprintf(out, "@%d %s P/F: %d/%d %s:%s Input: %s Output:%s \r\n\r\n", line, bot, passcnt, failcnt, category, specialty, at, actual);`
	`535`	`+ fprintf(out, "@%d %s P/F: %d/%d %s:%s Input: %s Output:%s \r\n\r\n", line, bot, passcnt, failcnt, category, specialty, input, actual);`
`536`	`536`	`}`
`537`	`537`	`if (((passcnt + failcnt) % 100) == 0) printf("at %d pass:%d fail:%d\r\n", passcnt + failcnt, passcnt, failcnt);`
`538`	`538`	`if (!ptr) break; // end of messages`
Original file line number	Diff line number	Diff line change
`@@ -213,7 +213,7 @@ void myexit(char* msg, int code)`
`213`	`213`	`if (code == 0) fprintf(in, (char*)"CS exited at %s\r\n", GetTimeInfo(&ptm, true));`
`214`	`214`	`else fprintf(in, (char*)"CS terminated at %s\r\n", GetTimeInfo(&ptm, true));`
`215`	`215`	`FClose(in);`
`216`		`- CloseSystem();`
	`216`	`+ if (!client) CloseSystem();`
`217`	`217`	`exit((code == 0) ? EXIT_SUCCESS : EXIT_FAILURE);`
`218`	`218`	`}`
`219`	`219`
Original file line number	Diff line number	Diff line change
`@@ -2172,6 +2172,10 @@ bool AdjustUTF8(char* start,char* buffer)`
`2172`	`2172`	`}`
`2173`	`2173`	`buffer = x - 1; // valid utf8`
`2174`	`2174`	`}`
	`2175`	`+ else if (*buffer == 0x92) // windows smart quote not real unicode`
	`2176`	`+ {`
	`2177`	`+ *buffer = '\'';`
	`2178`	`+ }`
`2175`	`2179`	`else // invalid utf8`
`2176`	`2180`	`{`
`2177`	`2181`	`hasbadutf = true;`