Changeset 74

Timestamp:

11/23/08 15:25:58 (16 years ago)

Author:

ahe

Message:

break clinet code into small function calls

Files:

• vtcross/branches/trnewman/CR_shell/src/main_cognitive_engine.cpp (modified) (5 diffs)

vtcross/branches/trnewman/CR_shell/src/main_cognitive_engine.cpp

@@ -69 +69 @@
 }
 
-int GetXMLFromServer(int sockfd, Utility uList[], Parameter pList[], 
-        Observable oList[], CE_Info *ce_info)
+
+int GetUtility(int sockfd, Utility uList[], CE_Info *ce_info)
 {
     char buffer[256];
-    int i,j;
+    int i;
 
     // read unitilities
@@ -103 +103 @@
         uList[i].target = atof(buffer);
     }
-
-    // read parameters
+    return 1;
+}
+
+
+int GetParameter(int sockfd, Parameter pList[], CE_Info *ce_info)
+{
+    char buffer[256];
+    int i, j;
+
     // numParameters
     bzero(buffer,256);
@@ -154 +161 @@
             strcpy(pList[i].affection_list[j].relation, buffer);
         }
-
-    }
-    
-    // read obervables
+    }
+    return 1;
+}
+
+
+int GetObservable(int sockfd, Observable oList[], CE_Info *ce_info)
+{
+    char buffer[256];
+    int i,j;
+
     // numParameters
     bzero(buffer,256);
@@ -168 +181 @@
             ReadMessage(sockfd,buffer);
             printf("Name: %s\n", buffer);
-        strcpy(pList[i].name, buffer);
+        strcpy(oList[i].name, buffer);
                  
         // numAffects
@@ -188 +201 @@
         }
     }
+    return 1;
+}
+
+
+int GetXMLFromServer(int sockfd, Utility uList[], Parameter pList[], 
+        Observable oList[], CE_Info *ce_info)
+{
+    // get utilities
+    GetUtility(sockfd, uList, ce_info);
+    
+    // get parameters
+    GetParameter(sockfd, pList, ce_info);
+
+    // read obervables
+    GetObservable(sockfd, oList, ce_info);
 
     printf("xml reception done\n");
     
-    return 0;
+    return 1;
 }