2020-04-06 /Kathy Yeh

1. modify uuid format
2.modify offline error

EVSE/Modularization/ocppfiles/MessageHandler.c

@@ -17,12 +17,7 @@
 #include 	<ctype.h>
 #include 	"libwebsockets.h"
 #include 	<lws_config.h>
-#include	"hashmap.h"
-#include	"ShareMemory.h"
-#include	"TransactionQueue.h"
 #include	"define.h"
-#include	"SystemLogMessage.h"
-//#include 	"config.h"
 #include 	<sys/socket.h>
 #include 	<netinet/in.h>
 #include 	<stdlib.h>
@@ -32,14 +27,15 @@
 #include	<fcntl.h>
 #include	"sqlite3.h"
 #include 	<arpa/inet.h>
-//#define _GNU_SOURCE
 #include 	<time.h>
-#include  	"MessageHandler.h"
 #include    	<assert.h>
 #include 	<pthread.h>
 #include 	<mcheck.h>
-
-
+#include  	"MessageHandler.h"
+#include	"SystemLogMessage.h"
+#include	"hashmap.h"
+#include	"ShareMemory.h"
+#include	"TransactionQueue.h"
 
 
 
@@ -8858,7 +8854,7 @@ int handleSetChargingProfileRequest(char *uuid, char *payload)
 	//int lno=0;//, linectr = 0;
 	//int modifyflag = FALSE;
 	char filename[MAX]={0};
-	char tempfile[] = "/Storage/OCPP/temp.json";
+	char tempfile[] = "/Storage/OCPP/SetChargingProfiletemp.json";
 	//int  resultRename=0;
 	char rmFileCmd[50]={0};
 	char tempchargingProfilePurposeStr[30]={0};
@@ -10504,7 +10500,7 @@ void handleAuthorizeResponse(char *payload, int gun_index)
 	int parentIdTagISNULL=FALSE;
 	char sstr[160]={ 0 };
 	char* filename = AuthorizationCache_JSON;
-	char tempfile[] = "/Storage/OCPP/temp.json";
+	char tempfile[] = "/Storage/OCPP/Authorizetemp.json";
 	int c = 0;
 	char *loc;
 	int  resultRename=0;
@@ -11297,9 +11293,9 @@ int initialConfigurationTable(void)
 		ShmOCPP16Data->ConfigurationTable.CoreProfile[AllowOfflineTxForUnknownId].ItemAccessibility = 1;
 		printf("AllowoddlineTXForUnknownId type: %d  \n", ShmOCPP16Data->ConfigurationTable.CoreProfile[AllowOfflineTxForUnknownId].ItemAccessibility);
 		strcpy((char *)ShmOCPP16Data->ConfigurationTable.CoreProfile[AllowOfflineTxForUnknownId].ItemName, "AllowOfflineTxForUnknownId");
-		strcpy((char *)ShmOCPP16Data->ConfigurationTable.CoreProfile[AllowOfflineTxForUnknownId].ItemData, "TRUE" );
+		strcpy((char *)ShmOCPP16Data->ConfigurationTable.CoreProfile[AllowOfflineTxForUnknownId].ItemData, "FALSE" );
 
-		fprintf(outfile,"{\"key\":\"%s\",\"readonly\":%s,\"value\":\"%s\"}\n","AllowOfflineTxForUnknownId", "false", "TRUE");
+		fprintf(outfile,"{\"key\":\"%s\",\"readonly\":%s,\"value\":\"%s\"}\n","AllowOfflineTxForUnknownId", "false", "FALSE");
 
 		//AuthorizationCacheEnabled
 		ShmOCPP16Data->ConfigurationTable.CoreProfile[AuthorizationCacheEnabled].ItemAccessibility = 1;
@@ -15139,8 +15135,8 @@ void SetTransactionIdZero(int transactionId)
 	//TransactionId[gunindex] = 0;
     char ch;
     FILE *fptr1, *fptr2;
-	int temptransactionId;
-    char str[100]={0}, temp[] = "/Storage/OCPP/temp.txt";
+	int temptransactionId = 0;
+    char str[100]={0}, strtemp[100]={0}, temp[] = "/Storage/OCPP/QueueTransactionIdtemp.json";
 	printf("\n\n Delete a specific line from a file :\n");
 	printf("-----------------------------------------\n");
 	//scanf("%s",fname);
@@ -15177,13 +15173,19 @@ void SetTransactionIdZero(int transactionId)
     		char *revbuf[8] = {0}; //存放分割後的子字串
     		int num = 0;//分割後子字串的個數
 
+    		strcpy(strtemp, str);
     		splitstring(str,",",revbuf,&num); //呼叫函式進行分割
 
-    		temptransactionId = atoi(revbuf[2]);
-    		if(transactionId != temptransactionId)
+    		if(revbuf[2][0] != '\0')
     		{
-    			fprintf(fptr2, "%s", str);
+    			temptransactionId = atoi(revbuf[2]);
+    			if(transactionId != temptransactionId)
+    			{
+    			   fprintf(fptr2, "%s", strtemp);
+    			}
+
     		}
+
     	}
 
     }

EVSE/Modularization/ocppfiles/Module_OcppBackend.c

@@ -34,7 +34,6 @@
 #include	"sqlite3.h"
 
 
-
 #ifndef SPEC_LATEST_SUPPORTED
 #define SPEC_LATEST_SUPPORTED 13
 #endif
@@ -300,14 +299,14 @@ int strposs(char *source, char *substr, int idx)
    return result;
 }
 
-//static int testnum = 0;
+static int testnum = 0;
 char *random_uuid( char buf[37] )
 {
-    const char *c = "89ab";
+   // const char *c = "89ab";
     char *p = buf;
-    int n;
+  //  int n;
 
-#if 0 // test
+#if 1 // test
     time_t seconds;
 
     seconds = time(NULL);
@@ -317,10 +316,10 @@ char *random_uuid( char buf[37] )
     //printf("\n testnum:%d\n", testnum);
     //printf("\n seconds:%d\n", seconds);
 
-    sprintf(p, "%03d%034d", testnum, seconds);
+    sprintf(p, "%03d%034d", testnum, (unsigned int)(seconds));
     //printf("\n p:%s\n", p);
 #endif
-#if 1
+#if 0
     for( n = 0; n < 16; ++n )
     {
         int b = rand()%255;
@@ -968,7 +967,7 @@ return 0;
 }
 
 int delq() {
-char tempfile[] = "/Storage/OCPP/temp.json";
+char tempfile[] = "/Storage/OCPP/delqtemp.json";
 FILE *infile;
 FILE *outfile;
 int  resultRename=0;
@@ -981,11 +980,11 @@ DEBUG_INFO("delq()\n");
 // Check for directory existence
 if (S_ISDIR(stats.st_mode) == 1)
 {
-	DEBUG_INFO("\n OCPP directory exist \n");
+	//DEBUG_INFO("\n OCPP directory exist \n");
 }
 else
 {
-	DEBUG_INFO("\n OCPP directory not exist, create dir \n");
+	//DEBUG_INFO("\n OCPP directory not exist, create dir \n");
 	sprintf(rmFileCmd,"mkdir -p %s","/Storage/OCPP");
 	system(rmFileCmd);
 }
@@ -1003,7 +1002,7 @@ else
 
 	if(log == NULL)
 	{
-		DEBUG_INFO("log is NULL\n");
+		//DEBUG_INFO("log is NULL\n");
 		return 0;
 	}
 	else
@@ -1050,10 +1049,13 @@ else
 			TransactionQueueNum = TransactionQueueNum - 1;
 			TransactionQueueInterval = 0;
 			TransactionMessageResend = 1;
+			DEBUG_INFO("delete the item\n");
 		}
 
 		if(i != 0)
+		{
 			fprintf(outfile,"%s\n", buf);
+		}
 
 		i = i + 1;
 	}
@@ -1253,10 +1255,6 @@ if( fgets (str, 1200, fp)!=NULL ) {
 		{
 			sprintf(tempdata, "StartTransaction,%d", (tempconnectorId-1));
 		}
-		//else if(tempconnectorId == 0)
-		//{
-		//	sprintf(tempdata, "StartTransaction,%d", 0);
-		//}
 
         //GUID
 		memset(sstr ,0, sizeof(sstr) );