twingle/twingle/content rdfds.js,1.1,1.2 twingle.js,1.4,1.5 twingle.xul,1.2,1.3

Update of /cvs/root/twingle/twingle/content
In directory alpha.oscom.org:/tmp/cvs-serv6868/content

Modified Files:
	rdfds.js twingle.js twingle.xul 
Log Message:
Changed to rely on jslib, now have two sites by default

Index: rdfds.js
===================================================================
RCS file: /cvs/root/twingle/twingle/content/rdfds.js,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** rdfds.js	6 Mar 2003 17:51:09 -0000	1.1
--- rdfds.js	8 Mar 2003 15:24:36 -0000	1.2
***************
*** 141,144 ****
--- 141,145 ----
                      .getService(Components.interfaces.nsIIOService);
    baseUri=ios.newURI(baseUri,null,null);
+   dump("\nnew uri is " + baseUri.spec);
    var xmlParser=Components.classes["@mozilla.org/rdf/xml-parser;1"]
                            .createInstance(Components.interfaces.nsIRDFXMLParser);

Index: twingle.js
===================================================================
RCS file: /cvs/root/twingle/twingle/content/twingle.js,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** twingle.js	6 Mar 2003 20:37:42 -0000	1.4
--- twingle.js	8 Mar 2003 15:24:36 -0000	1.5
***************
*** 1,12 ****
--- 1,54 ----
+ /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+ 
+ include ('chrome://jslib/content/io/file.js');
+ include('chrome://jslib/content/io/dir.js');
+ include('chrome://jslib/content/io/fileUtils.js'); 
+ include('chrome://jslib/content/io/dirUtils.js'); 
  
  /* Declare, but don't initialize, some global variables */
  var sitesds = null;
+ var twingledirpath = null;
  
  function initTwingle () 
  {
      /* First let's get the sites datasource set */
+     initTwingleProfileDir();
      initNavigator();
  }
  
+ 
+ function initTwingleProfileDir () 
+ {
+     var fu = new FileUtils(); 
+     var du = new DirUtils;
+     const localsitepath = "chrome://twingle/content/sampledata";
+     var localsitechromepath = fu.chromeToPath(localsitepath);
+     var prefsdirpath = du.getPrefsDir();
+     twingledirpath = prefsdirpath + "/twingle";  // Global so don't use var!
+ 
+     var prefsdir = new Dir(prefsdirpath);
+     var twingledir = new Dir(twingledirpath);
+     if (twingledir.exists()) {
+         dump("\n Found + " + twingledirpath);
+         return;
+     }
+     else {
+         dump("\n No twingledir at " + twingledirpath + ", creating now...");
+         twingledir.create();
+     };
+ 
+     // Copy the starter files from content/sampledata to profile/twingle
+     var localsitedir = new File(localsitechromepath + '/blanksites.rdf');
+     localsitedir.copy(twingledirpath + '/sites.rdf');
+     var localsitedir = new File(localsitechromepath + '/blankoscomtypes.rdf');
+     localsitedir.copy(twingledirpath + '/oscomtypes.rdf');
+     var localsitedir = new File(localsitechromepath + '/blanklocalsite.rdf');
+     localsitedir.copy(twingledirpath + '/localsite.rdf');
+ 
+     dump("\ncopied starter files to twingleprofiledir at " + twingledirpath);
+     return;
+ }
+ 
+ 
  function closeWindow()
  {
***************
*** 23,26 ****
  
  
! /*  ====  Utility functions  ====   */
  
--- 65,78 ----
  
  
! /* Debug function, dumps known datasouces to stdout using dump() */
! function dumpDataSourceManagers () {
!     var s = sitesds.sitesds.serializeToString();
!     dump("\nDumping sites..........\n" + s + "\n");
  
+     var s = sitesds.oscomtypesds.serializeToString();
+     dump("\nDumping common types..........\n" + s + "\n");
+ 
+     var s = sitesds.localsiteds.serializeToString();
+     dump("\nDumping localsite..........\n" + s + "\n");
+ 
+ }

Index: twingle.xul
===================================================================
RCS file: /cvs/root/twingle/twingle/content/twingle.xul,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** twingle.xul	6 Mar 2003 18:09:49 -0000	1.2
--- twingle.xul	8 Mar 2003 15:24:36 -0000	1.3
***************
*** 19,22 ****
--- 19,23 ----
     persist    = "screenX screenY width height sizemode">
  
+ <script type="application/x-javascript" src="chrome://jslib/content/jslib.js" />
  <script type="application/x-javascript" src="twingle.js"/>
  <script type="application/x-javascript" src="rdfds.js"/>
***************
*** 27,30 ****
--- 28,32 ----
    <command id="menu-file-close:command" oncommand="closeWindow();"/>
    <command id="menu-help-about:command" oncommand="showAboutTwingle();"/>
+   <command id="menu-debug-dump:command" oncommand="dumpDataSourceManagers();"/>
  </commandset>