[TeamTalk 207]: [743] trunk/usarsim: 1) Changed name of zip package in Makefile

[tk@edam.speech.cs.cmu.edu]

An HTML attachment was scrubbed...
URL: http://mailman.srv.cs.cmu.edu/pipermail/teamtalk-developers/attachments/20070913/e79d7e1c/attachment.html
-------------- next part --------------
Modified: trunk/usarsim/System/Makefile
===================================================================
--- trunk/usarsim/System/Makefile	2007-09-13 17:37:54 UTC (rev 742)
+++ trunk/usarsim/System/Makefile	2007-09-13 17:42:11 UTC (rev 743)
@@ -45,7 +45,7 @@
          $(INSTALL_TEXTURES) $(INSTALL_STATICMESHES)
 
 package:
-	cd $(INSTALL_DIR); echo $(PACKAGES) $(MAPS) $(TEXTURES) $(STATICMESHES) | sed 's/\.\.\///g' | xargs zip -u TreasureHunt.zip 
+	cd $(INSTALL_DIR); echo $(PACKAGES) $(MAPS) $(TEXTURES) $(STATICMESHES) | sed 's/\.\.\///g' | xargs zip -u TreasureHuntSim.zip 
 
 $(INSTALL_DIR)/%:../%
 	cp -f $< $@
@@ -72,4 +72,4 @@
 	rm -f $@
 
 clean:
-	rm -f $(PACKAGES) TreasureHunt.zip
\ No newline at end of file
+	rm -f $(PACKAGES) TreasureHuntSim.zip
\ No newline at end of file

Modified: trunk/usarsim/USARBotAPI/Classes/ComServer.uc
===================================================================
--- trunk/usarsim/USARBotAPI/Classes/ComServer.uc	2007-09-13 17:37:54 UTC (rev 742)
+++ trunk/usarsim/USARBotAPI/Classes/ComServer.uc	2007-09-13 17:42:11 UTC (rev 743)
@@ -42,7 +42,9 @@
 var config float eMaxObs;
 
 //Check if a robot is registered with the server
-function bool isRegistered(string name)
+// if it is registered, then return the registration number
+// else return -1
+function int isRegistered(string name)
 {
 	local int i;
 	i=0;
@@ -50,11 +52,11 @@
 	{
 		if(name==RegRobots[i].str1)
 		{
-			return true;
+			return i;
 		}
 		i++;
 	}
-	return false;
+	return -1;
 }
 
 //Check if a robot is listening
@@ -196,7 +198,7 @@
 {
     //Parsing the message
 	local string cmdType;
-	local int attrNum, i,j;
+	local int attrNum, i,j, regNo;
 	local bool b1,b2;
 	local float ss;
     
@@ -239,22 +241,37 @@
 				break;
 			}
 			//Checking if a robot with the same name is registered
-			if(isRegistered(ParsedMessg[1]))
+			regNo = isRegistered(ParsedMessg[1]);
+			if(regNo != -1)
 			{
-				if(bDebug) log("ComServer: Robot with name "$ParsedMessg[1]$" already registerd");
-				ep.SendText("Fail: Robot with name "$ParsedMessg[1]$" already registered;");
-				break;
+				if( RegRobots[regNo].str2!=ParsedMessg[2] )
+				{
+					if(bDebug) log("ComServer: Robot with name "$ParsedMessg[1]$" already registerd");
+					ep.SendText("Fail: Robot with name "$ParsedMessg[1]$" already registered;");
+					break;
+				}
+				else
+				{
+					if(bDebug)
+					{
+						log("ComServer: "$RegRobots[numReg].str1$" re-registered with IP "$RegRobots[numReg].str2);
+						log("ComServer: "$(numReg+1)$" robots registered");
+					}
+				}
 			}
-			//Registering
-			RegRobots.insert(numReg,1);
-			RegRobots[numReg].str1$=ParsedMessg[1];
-			RegRobots[numReg].str2$=ParsedMessg[2];
-			if(bDebug)
+			else
 			{
-				log("ComServer: "$RegRobots[numReg].str1$" registered with IP "$RegRobots[numReg].str2);
-				log("ComServer: "$(numReg+1)$" robots registered");
+				//Registering
+				RegRobots.insert(numReg,1);
+				RegRobots[numReg].str1$=ParsedMessg[1];
+				RegRobots[numReg].str2$=ParsedMessg[2];
+				if(bDebug)
+				{
+					log("ComServer: "$RegRobots[numReg].str1$" registered with IP "$RegRobots[numReg].str2);
+					log("ComServer: "$(numReg+1)$" robots registered");
+				}
+				numReg++;
 			}
-			numReg++;
 			ep.SendText("OK;");
 			break;
 		case "LISTEN":
@@ -266,7 +283,7 @@
 				break;
 			}
 			//Checking if the robot is registered
-			if(!isRegistered(ParsedMessg[1]))
+			if(isRegistered(ParsedMessg[1]) == -1)
 			{
 				if(bDebug) log("ComServer: Robot "$ParsedMessg[1]$" not registered");
 				ep.SendText("Fail: Robot "$ParsedMessg[1]$" not registered;");