[Ogoglio-commits] SF.net SVN: ogoglio: [755] maven/trunk/ogoglio-server/src/main

[<tre...@us...>]

Revision: 755
          http://ogoglio.svn.sourceforge.net/ogoglio/?rev=755&view=rev
Author:   trevorolio
Date:     2008-02-18 06:33:36 -0800 (Mon, 18 Feb 2008)

Log Message:
-----------
Cleanup tweakes and a log function in ogoglio.js which makes the firebug console much more useful.

Modified Paths:
--------------
    maven/trunk/ogoglio-server/src/main/java/com/ogoglio/persist/SpacePersistTasks.java
    maven/trunk/ogoglio-server/src/main/java/com/ogoglio/sim/Sim.java
    maven/trunk/ogoglio-server/src/main/resources/siteTemplates/ogoglio.js
    maven/trunk/ogoglio-server/src/main/resources/siteTemplates/spaceui.js

Modified: maven/trunk/ogoglio-server/src/main/java/com/ogoglio/persist/SpacePersistTasks.java
===================================================================
--- maven/trunk/ogoglio-server/src/main/java/com/ogoglio/persist/SpacePersistTasks.java	2008-02-18 14:31:48 UTC (rev 754)
+++ maven/trunk/ogoglio-server/src/main/java/com/ogoglio/persist/SpacePersistTasks.java	2008-02-18 14:33:36 UTC (rev 755)
@@ -258,9 +258,8 @@
     }
 
     private static SimRecord pickSimRandomly(final SpaceRecord spaceRecord, SessionFactory sessionFactory, SimRecord[] active) throws PersistException {
-        SimRecord rec;
         //pick randomly among actives
-        rec = (SimRecord) active[Math.abs(RANDOM.nextInt() % active.length)];
+        SimRecord rec = (SimRecord) active[Math.abs(RANDOM.nextInt() % active.length)];
         spaceRecord.setSimID(rec.getSimID());
         updateRecordAndUpdateModifiedTime(spaceRecord, sessionFactory, true);
         return rec;

Modified: maven/trunk/ogoglio-server/src/main/java/com/ogoglio/sim/Sim.java
===================================================================
--- maven/trunk/ogoglio-server/src/main/java/com/ogoglio/sim/Sim.java	2008-02-18 14:31:48 UTC (rev 754)
+++ maven/trunk/ogoglio-server/src/main/java/com/ogoglio/sim/Sim.java	2008-02-18 14:33:36 UTC (rev 755)
@@ -277,7 +277,6 @@
         }
     }
 
-    // TODO is there a better way to shutdown this sim ?
     public boolean shutdownSpaceSim(long spaceID) {
         try {
             SpaceRecord record = SpacePersistTasks.findSpaceBySpaceID(spaceID, sessionFactory);
@@ -286,7 +285,7 @@
                 return false;
             }
             if (simRecord.getSimID() != record.getSimID()) {
-                Log.error("Tried to shut down space not on this sim: " + spaceID);
+                Log.error("Tried to shut down space "+ spaceID + " which is not on this sim (" + simRecord.getSimID() + ") but is on sim " + record.getSimID());
                 synchronized (spaceSimulators) {
                     spaceSimulators.removeForward(new Long(record.getSpaceID()));
                 }

Modified: maven/trunk/ogoglio-server/src/main/resources/siteTemplates/ogoglio.js
===================================================================
--- maven/trunk/ogoglio-server/src/main/resources/siteTemplates/ogoglio.js	2008-02-18 14:31:48 UTC (rev 754)
+++ maven/trunk/ogoglio-server/src/main/resources/siteTemplates/ogoglio.js	2008-02-18 14:33:36 UTC (rev 755)
@@ -23,6 +23,14 @@
 }
 
 //BEGIN GENERAL UTILS
+function logXML(xml){
+	if(xml == null){
+		console.log("Null xml");
+	} else {
+		console.log(serializeXML(xml));
+	}
+}
+
 function parseLocationParameters(){
     	var paramPhrases = location.search.substring(1, location.search.length).split("&");
     	var paramDict = new Object();

Modified: maven/trunk/ogoglio-server/src/main/resources/siteTemplates/spaceui.js
===================================================================
--- maven/trunk/ogoglio-server/src/main/resources/siteTemplates/spaceui.js	2008-02-18 14:31:48 UTC (rev 754)
+++ maven/trunk/ogoglio-server/src/main/resources/siteTemplates/spaceui.js	2008-02-18 14:33:36 UTC (rev 755)
@@ -102,7 +102,10 @@
 	var codeBase = getCodeBase(serverIP);
 
 	var html = "<applet id='viewer' archive='ogoglio-common.jar,ogoglio-viewer-applet.jar' codebase='" + codeBase + "' code='com.ogoglio.viewer.applet.ViewerApplet' width='" + viewerWidth + "' height='" + viewerHeight + "' mayscript='true'>";
-	html += "<param name='loginCookie' value='" + loginCookie + "' />";
+ 	//html += "<param name='codebase_lookup' value='false'/>"; //speed up because we only use jars
+	//html += "<param name='noddraw.check' value='true'>"; //turn off DirectDraw on windows
+	//html += "<param name='noddraw.check.silent' value='true'>"; //but don't bother the user about turning off DirectDraw
+ 	html += "<param name='loginCookie' value='" + loginCookie + "' />";
 	html += "<param name='serviceURI' value='" + codeBase + "' />";
 	html += "<param name='serverIP' value='" + serverIP + "' />";
 	html += "<param name='spaceID' value='" + locationParameters['spaceID'] + "' />";


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.