frontierkernel-commits — Mailing list for Subversion commit messages.

[frontierkernel-commits] Frontier/Common/headers shellmenu.h,1.7,1.8,

[Andre R. <and...@us...>]

Update of /cvsroot/frontierkernel/Frontier/Common/headers
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3016/Common/headers

Modified Files:
	shellmenu.h 
Log Message:
On Windows, don't include menu resources that aren't actually used by the application in order to avoid picking up their keyboard shortcuts.

Index: shellmenu.h
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/shellmenu.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** shellmenu.h	25 Feb 2006 17:13:26 -0000	1.7
--- shellmenu.h	25 Feb 2006 18:44:27 -0000	1.8
***************
*** 26,69 ****
  ******************************************************************************/
  
  #define shellmenuinclude /*so other includes can tell if we've been loaded*/
  
  
! #ifndef shelltypesinclude
! 	
! 	#include "shelltypes.h"
  
! #endif
  
  
! #ifdef MACVERSION
! 	#define firstmainmenu 1
! 	#define firsthiermenu 128
! 	#define mainmenuincrement 1
! 	#define hiermenuincrement 1
  
! 	#define applemenu firstmainmenu
! 	#define filemenu (applemenu + mainmenuincrement)
! 	#define editmenu (filemenu + mainmenuincrement)
! 	#define windowsmenu (editmenu + mainmenuincrement)
  
! 	#define fontmenu firsthiermenu
! 	#define stylemenu (fontmenu + hiermenuincrement)
! 	#define sizemenu (stylemenu + hiermenuincrement)
! 	#define leadingmenu (sizemenu + hiermenuincrement)
! 	#define justifymenu (leadingmenu + hiermenuincrement)
! 	#define findandreplacemenu (justifymenu + hiermenuincrement)
! 	#define commonstylesmenu (findandreplacemenu + hiermenuincrement)
! 	#define newobjectmenu (commonstylesmenu + hiermenuincrement)
! 	#define virtualmenu (newobjectmenu + hiermenuincrement) /* never appears in user interface -- used for externed keyboard */
! 	#define openrecentmenu ((virtualmenu + hiermenuincrement))
  
! 	#define lastmainmenu windowsmenu
! 	#define lasthiermenu openrecentmenu
  #endif //MACVERSION
  
  
! #ifdef WIN95VERSION
! 	#define mainmenuincrement 1000
! 	#define hiermenuincrement 100
  
  	#define applemenu			1000
--- 26,78 ----
  ******************************************************************************/
  
+ #ifndef shellmenuinclude
  #define shellmenuinclude /*so other includes can tell if we've been loaded*/
  
  
! #ifdef MACVERSION
  
! 	/*
! 	2006-02-25 aradke: must keep in sync with SHELL.R
! 	*/
  
+ 	#define mainmenuincrement		1
+ 	#define hiermenuincrement		1
  
! 	#define applemenu				1
! 	#define filemenu				2
! 	#define editmenu				3
! 	#define windowsmenu				4
  
! 	#define firstmainmenu			filemenu
! 	#define lastmainmenu			windowsmenu
  
! 	#define fontmenu				128
! 	#define stylemenu				129
! 	#define sizemenu				130
! 	#define leadingmenu				131
! 	#define justifymenu				132
! 	#define findandreplacemenu		133
! 	#define commonstylesmenu		134
! 	#define newobjectmenu			135
! 	#define virtualmenu				136 /* never appears in user interface -- used for extended keyboard */
! 	#define openrecentmenu			137
  
! 	#define firsthiermenu			fontmenu
! 	#define lasthiermenu			openrecentmenu
! 	
  #endif //MACVERSION
  
  
! #ifdef WIN95VERSION	
! 
! 	/*
! 	2006-02-25 aradke: must keep in sync with WinLand.rc
! 	
! 	2006-02-25 aradke: undefine menus for Pike and OPML Editor that aren't actually used by the app
! 		in order to avoid picking up their keyboard shortcuts at runtime
! 	*/
! 
! 	#define mainmenuincrement	1000
! 	#define hiermenuincrement 	100
  
  	#define applemenu			1000
***************
*** 76,109 ****
  	#define lastmainmenu		helpmenu
  
! #ifdef PIKE
! 	#undef stylemenu
! 	#undef leadingmenu
! 	#undef justifymenu
! 	#undef newobjectmenu
! 	#undef openrecentmenu
  
! 	#define virtualmenu			5100	/* 2006-02-25 aradke: never actually displayed */
! 	#define fontmenu			5200
! 	#define sizemenu			5300
! 	#define findandreplacemenu	5400
! 	#define commonstylesmenu	5500	/*7.0b26 PBS*/
  
! 	#define firsthiermenu		fontmenu
! 	#define lasthiermenu		commonstylesmenu
! #else //!PIKE
! 	#define virtualmenu			5100	/* 2006-02-25 aradke: never actually displayed */
! 	#define fontmenu			5200
! 	#define stylemenu			5300
! 	#define sizemenu			5400
! 	#define leadingmenu			5500
! 	#define justifymenu			5600
! 	#define findandreplacemenu	5700
! 	#define commonstylesmenu	5800	/*7.0b26 PBS*/
! 	#define newobjectmenu		5900
! 	#define openrecentmenu		6000	/* 2006-02-05 aradke */
  
- 	#define firsthiermenu		fontmenu
- 	#define lasthiermenu		openrecentmenu
- #endif //!PIKE
  #endif //WIN95VERSION
  
--- 85,120 ----
  	#define lastmainmenu		helpmenu
  
! 	#ifdef PIKE
! 		#undef stylemenu
! 		#undef leadingmenu
! 		#undef justifymenu
! 		#undef newobjectmenu
! 		#undef openrecentmenu
  
! 		#define virtualmenu			5100	/* 2006-02-25 aradke: never actually displayed */
! 		#define fontmenu			5200
! 		#define sizemenu			5300
! 		#define findandreplacemenu	5400
! 		#define commonstylesmenu	5500	/*7.0b26 PBS*/
  
! 		#define firsthiermenu		fontmenu
! 		#define lasthiermenu		commonstylesmenu
! 	#else //!PIKE
! 		#define virtualmenu			5100	/* 2006-02-25 aradke: never actually displayed */
! 		#define fontmenu			5200
! 		#define stylemenu			5300
! 		#define sizemenu			5400
! 		#define leadingmenu			5500
! 		#define justifymenu			5600
! 		#define findandreplacemenu	5700
! 		#define commonstylesmenu	5800	/*7.0b26 PBS*/
! 		#define newobjectmenu		5900
! 		#define openrecentmenu		6000	/* 2006-02-05 aradke */
! 
! 		#define firsthiermenu		fontmenu
! 		#define lasthiermenu		openrecentmenu
! 
! 	#endif //!PIKE
  
  #endif //WIN95VERSION
  
***************
*** 285,288 ****
--- 296,303 ----
  
  
+ #if !defined(REZ) && !defined(RC_INVOKED)
+ 
+ #include "shelltypes.h"
+ 
  //#define ctmenustack (lastmainmenu - firstmainmenu + lasthiermenu - firsthiermenu + 2)
  #define ctmenustack ( (lastmainmenu - firstmainmenu) / mainmenuincrement \
***************
*** 352,353 ****
--- 367,371 ----
  extern void shellupdateopenrecentmenu (void); /* 2005-09-25 creedon */
  
+ #endif //!defined(REZ) && !defined(RC_INVOKED)
+ 
+ #endif //shellmenuinclude

[frontierkernel-commits] Frontier/Common/resources/Win32 WinLand.rc,1.18,1.19,

[Andre R. <and...@us...>]

Update of /cvsroot/frontierkernel/Frontier/Common/resources/Win32
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3016/Common/resources/Win32

Modified Files:
	WinLand.rc 
Log Message:
On Windows, don't include menu resources that aren't actually used by the application in order to avoid picking up their keyboard shortcuts.

Index: WinLand.rc
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/resources/Win32/WinLand.rc,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** WinLand.rc	23 Feb 2006 20:44:27 -0000	1.18
--- WinLand.rc	25 Feb 2006 18:44:27 -0000	1.19
***************
*** 366,369 ****
--- 366,370 ----
  #endif
  
+ #ifdef fontmenu
  fontmenu MENU DISCARDABLE
  BEGIN
***************
*** 373,377 ****
--- 374,380 ----
      END
  END
+ #endif
  
+ #ifdef stylemenu
  stylemenu MENU DISCARDABLE
  BEGIN
***************
*** 397,401 ****
--- 400,406 ----
      END
  END
+ #endif
  
+ #ifdef sizemenu
  sizemenu MENU DISCARDABLE
  BEGIN
***************
*** 415,419 ****
--- 420,426 ----
      END
  END
+ #endif
  
+ #ifdef leadingmenu
  leadingmenu MENU DISCARDABLE
  BEGIN
***************
*** 431,435 ****
--- 438,444 ----
      END
  END
+ #endif
  
+ #ifdef justifymenu
  justifymenu MENU DISCARDABLE
  BEGIN
***************
*** 442,446 ****
--- 451,457 ----
      END
  END
+ #endif
  
+ #ifdef newobjectmenu
  newobjectmenu MENU DISCARDABLE
  BEGIN
***************
*** 456,462 ****
--- 467,475 ----
      END
  END
+ #endif
  
  /*7.0b26 PBS: Find and Replace menu, Common Styles menu*/
  
+ #ifdef findandreplacemenu
  findandreplacemenu MENU DISCARDABLE
  BEGIN
***************
*** 469,473 ****
--- 482,488 ----
      END
  END
+ #endif
  
+ #ifdef commonstylesmenu
  commonstylesmenu MENU DISCARDABLE /* 2005-09-25 creedon */
  BEGIN
***************
*** 480,484 ****
--- 495,501 ----
      END
  END
+ #endif
  
+ #ifdef openrecentmenu
  openrecentmenu MENU DISCARDABLE /* 2005-09-25 creedon */
  BEGIN
***************
*** 489,492 ****
--- 506,510 ----
      END
  END
+ #endif
  
  
***************
*** 498,508 ****
  IDMULTIPAD ACCELERATORS MOVEABLE PURE
  BEGIN
- #ifndef PIKE
  	"O",			filemenu+openitem,			VIRTKEY, CONTROL, NOINVERT
- #endif
  	"W",			filemenu+closeitem,			VIRTKEY, CONTROL, NOINVERT
  	"S",			filemenu+saveitem,			VIRTKEY, CONTROL, NOINVERT
  #ifdef PIKE
! 	"P",			filemenu+viewinbrowseritem,		VIRTKEY, CONTROL, NOINVERT
  #endif
  	"Q",			filemenu+quititem,			VIRTKEY, CONTROL, NOINVERT
--- 516,528 ----
  IDMULTIPAD ACCELERATORS MOVEABLE PURE
  BEGIN
  	"O",			filemenu+openitem,			VIRTKEY, CONTROL, NOINVERT
  	"W",			filemenu+closeitem,			VIRTKEY, CONTROL, NOINVERT
  	"S",			filemenu+saveitem,			VIRTKEY, CONTROL, NOINVERT
  #ifdef PIKE
! 	"P",			filemenu+viewinbrowseritem,	VIRTKEY, CONTROL, NOINVERT
! 	"N",			filemenu+newitem,			VIRTKEY, CONTROL, NOINVERT
! #else
! 	"P",			filemenu+printitem,			VIRTKEY, CONTROL, NOINVERT
! 	"N",			newobjectmenu+1,			VIRTKEY, CONTROL, NOINVERT
  #endif
  	"Q",			filemenu+quititem,			VIRTKEY, CONTROL, NOINVERT
***************
*** 518,522 ****
  	"L",			virtualmenu+moveleftitem,	VIRTKEY, CONTROL, NOINVERT
  	"R",			virtualmenu+moverightitem,	VIRTKEY, CONTROL, NOINVERT
- 	"N",			newobjectmenu+1,			VIRTKEY, CONTROL, NOINVERT
      VK_BACK,        editmenu+undoitem,          VIRTKEY, ALT, NOINVERT
      VK_DELETE,      editmenu+cutitem,           VIRTKEY, SHIFT, NOINVERT
--- 538,541 ----

[frontierkernel-commits] Frontier/Common/headers shellmenu.h,1.6,1.7,

[Andre R. <and...@us...>]

Update of /cvsroot/frontierkernel/Frontier/Common/headers
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23022

Modified Files:
	shellmenu.h 
Log Message:
Reorganized numbering of main menus and hierarchic menus on Windows. This change will break the OPML Editor build temporarily.

Index: shellmenu.h
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/headers/shellmenu.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** shellmenu.h	12 Feb 2006 11:26:16 -0000	1.6
--- shellmenu.h	25 Feb 2006 17:13:26 -0000	1.7
***************
*** 43,50 ****
  
  	#define applemenu firstmainmenu
- 
  	#define filemenu (applemenu + mainmenuincrement)
  	#define editmenu (filemenu + mainmenuincrement)
  	#define windowsmenu (editmenu + mainmenuincrement)
  	#define fontmenu firsthiermenu
  	#define stylemenu (fontmenu + hiermenuincrement)
--- 43,50 ----
  
  	#define applemenu firstmainmenu
  	#define filemenu (applemenu + mainmenuincrement)
  	#define editmenu (filemenu + mainmenuincrement)
  	#define windowsmenu (editmenu + mainmenuincrement)
+ 
  	#define fontmenu firsthiermenu
  	#define stylemenu (fontmenu + hiermenuincrement)
***************
*** 57,87 ****
  	#define virtualmenu (newobjectmenu + hiermenuincrement) /* never appears in user interface -- used for externed keyboard */
  	#define openrecentmenu ((virtualmenu + hiermenuincrement))
! #endif
  
  #ifdef WIN95VERSION
- 	#define firstmainmenu 2000
- 	#define firsthiermenu 3100
  	#define mainmenuincrement 1000
  	#define hiermenuincrement 100
  
! 	#define applemenu 1000
  
! 	// under windows, we can't use expressions for the menu #defines; the .rc compiler chokes
! 	#define filemenu 2000
! 	#define editmenu 3000
! 	#define windowsmenu 4000
! 	#define helpmenu 5000
! 	#define fontmenu firsthiermenu
! 	#define stylemenu 3200
! 	#define sizemenu 3300
! 	#define leadingmenu 3400
! 	#define justifymenu 3500
! 	#define findandreplacemenu 3600
! 	#define virtualmenu 4100
! 	#define commonstylesmenu 3700 /*7.0b26 PBS*/
! 	#define newobjectmenu 3800
! 	#define openrecentmenu 3900		/* 2006-02-05 aradke */
  
- #endif
  
  #define aboutitem 1
--- 57,111 ----
  	#define virtualmenu (newobjectmenu + hiermenuincrement) /* never appears in user interface -- used for externed keyboard */
  	#define openrecentmenu ((virtualmenu + hiermenuincrement))
! 
! 	#define lastmainmenu windowsmenu
! 	#define lasthiermenu openrecentmenu
! #endif //MACVERSION
! 
  
  #ifdef WIN95VERSION
  	#define mainmenuincrement 1000
  	#define hiermenuincrement 100
  
! 	#define applemenu			1000
! 	#define filemenu			2000
! 	#define editmenu			3000
! 	#define windowsmenu			4000
! 	#define helpmenu			5000
  
! 	#define firstmainmenu		filemenu
! 	#define lastmainmenu		helpmenu
! 
! #ifdef PIKE
! 	#undef stylemenu
! 	#undef leadingmenu
! 	#undef justifymenu
! 	#undef newobjectmenu
! 	#undef openrecentmenu
! 
! 	#define virtualmenu			5100	/* 2006-02-25 aradke: never actually displayed */
! 	#define fontmenu			5200
! 	#define sizemenu			5300
! 	#define findandreplacemenu	5400
! 	#define commonstylesmenu	5500	/*7.0b26 PBS*/
! 
! 	#define firsthiermenu		fontmenu
! 	#define lasthiermenu		commonstylesmenu
! #else //!PIKE
! 	#define virtualmenu			5100	/* 2006-02-25 aradke: never actually displayed */
! 	#define fontmenu			5200
! 	#define stylemenu			5300
! 	#define sizemenu			5400
! 	#define leadingmenu			5500
! 	#define justifymenu			5600
! 	#define findandreplacemenu	5700
! 	#define commonstylesmenu	5800	/*7.0b26 PBS*/
! 	#define newobjectmenu		5900
! 	#define openrecentmenu		6000	/* 2006-02-05 aradke */
! 
! 	#define firsthiermenu		fontmenu
! 	#define lasthiermenu		openrecentmenu
! #endif //!PIKE
! #endif //WIN95VERSION
  
  
  #define aboutitem 1
***************
*** 207,212 ****
  #define aboutitem 1
  
- #define fontmenu firsthiermenu
- 
  // #define stylemenu (fontmenu + hiermenuincrement)
  #define plainitem 1
--- 231,234 ----
***************
*** 263,277 ****
  
  
! #ifdef MACVERSION
! 	#define lastmainmenu windowsmenu
! 	#define lasthiermenu openrecentmenu
! #endif
! #ifdef WIN95VERSION
! 	#define lastmainmenu helpmenu
! 	#define lasthiermenu openrecentmenu
! #endif
! 
! 
! #define ctmenustack (lastmainmenu - firstmainmenu + lasthiermenu - firsthiermenu + 2)
  
  typedef struct tymenuinfo {
--- 285,292 ----
  
  
! //#define ctmenustack (lastmainmenu - firstmainmenu + lasthiermenu - firsthiermenu + 2)
! #define ctmenustack ( (lastmainmenu - firstmainmenu) / mainmenuincrement \
! 					+ (lasthiermenu - firsthiermenu) / hiermenuincrement \
! 					+ 2)
  
  typedef struct tymenuinfo {

[frontierkernel-commits] Frontier/Common/source menubar.c,1.4,1.5,

[Andre R. <and...@us...>]

Update of /cvsroot/frontierkernel/Frontier/Common/source
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22126

Modified Files:
	menubar.c 
Log Message:
On Windows, the menu with the highest id can be a main menu or a hierarchic (sub)menu. Deal with it.

Index: menubar.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/menubar.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** menubar.c	11 Jan 2005 22:48:09 -0000	1.4
--- menubar.c	25 Feb 2006 17:11:14 -0000	1.5
***************
*** 74,78 ****
  
  #ifdef WIN95VERSION
! 	#define defaultbasemenuid ((lastmainmenu / hiermenuincrement) + 1)
  #endif
  
--- 74,82 ----
  
  #ifdef WIN95VERSION
! 	/*
! 	2006-02-25 aradke: on windows, the menu with the highest id can be
! 		a main menu or a hierarchic (sub)menu. deal with it.
! 	*/
! 	#define defaultbasemenuid ((max(lastmainmenu, lasthiermenu) / hiermenuincrement) + 1)
  #endif
  

[frontierkernel-commits] Frontier/Common/source shellmenu.c,1.15,1.16,

[Andre R. <and...@us...>]

Update of /cvsroot/frontierkernel/Frontier/Common/source
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv478

Modified Files:
	shellmenu.c 
Log Message:
Added defensive driving in shellhandlemenu for commands that expect a frontmost window to be defined.

Index: shellmenu.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/shellmenu.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** shellmenu.c	19 Feb 2006 17:06:38 -0000	1.15
--- shellmenu.c	25 Feb 2006 15:11:57 -0000	1.16
***************
*** 1735,1738 ****
--- 1735,1743 ----
  			short fontnumber;
  			
+ 			if (shellwindowinfo == nil) {	/* 2006-02-25 aradke: defensive driving, requires front window */
+ 				ouch ();
+ 				break;
+ 				}
+ 				
  			getmenuitem (shellmenuhandle (fontmenu), iditem, bs);
  			
***************
*** 1755,1758 ****
--- 1760,1768 ----
  			short size = 0;
  			
+ 			if (shellwindowinfo == nil) {	/* 2006-02-25 aradke: defensive driving, requires front window */
+ 				ouch ();
+ 				break;
+ 				}
+ 			
  			switch (iditem) {
  				
***************
*** 1833,1836 ****
--- 1843,1851 ----
  			tyselectioninfo x;
  			
+ 			if (shellwindowinfo == nil) {	/* 2006-02-25 aradke: defensive driving, requires front window */
+ 				ouch ();
+ 				break;
+ 				}
+ 			
  			clearbytes (&x, sizeof (x)); /*set all flags to false*/
  			
***************
*** 1897,1900 ****
--- 1912,1920 ----
  			register tyjustification justification = unknownjustification;
  			
+ 			if (shellwindowinfo == nil) {	/* 2006-02-25 aradke: defensive driving, requires front window */
+ 				ouch ();
+ 				break;
+ 				}
+ 			
  			switch (iditem) {
  				
***************
*** 1935,1938 ****
--- 1955,1963 ----
  			register short leading = -1;
  			
+ 			if (shellwindowinfo == nil) {	/* 2006-02-25 aradke: defensive driving, requires front window */
+ 				ouch ();
+ 				break;
+ 				}
+ 			
  			switch (iditem) {
  				

[frontierkernel-commits] Frontier/Common/resources/Win32 WinLand.rc,1.17,1.18,

[Andre R. <and...@us...>]

Update of /cvsroot/frontierkernel/Frontier/Common/resources/Win32
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24376

Modified Files:
	WinLand.rc 
Log Message:
Disabled keyboard shortcuts for Edit > Style menu items since they conflict with File menu items.

Index: WinLand.rc
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/resources/Win32/WinLand.rc,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** WinLand.rc	23 Feb 2006 04:43:24 -0000	1.17
--- WinLand.rc	23 Feb 2006 20:44:27 -0000	1.18
***************
*** 380,383 ****
--- 380,390 ----
          MENUITEM "Plain Text",                  stylemenu+plainitem
          MENUITEM SEPARATOR
+ #if 1	// 2006-02-23 aradke: disabled due to conflict with file menu items
+         MENUITEM "&Bold",                       stylemenu+bolditem
+         MENUITEM "&Italic",                     stylemenu+italicitem
+         MENUITEM "&Underline",                  stylemenu+underlineitem
+         MENUITEM "&Outline",                    stylemenu+outlineitem
+         MENUITEM "&Shadow",                     stylemenu+shadowitem
+ #else	//MACVERSION
          MENUITEM "&Bold\tCtrl+Shift+B",                        stylemenu+bolditem
          MENUITEM "&Italic\tCtrl+Shift+I",                      stylemenu+italicitem
***************
*** 385,388 ****
--- 392,396 ----
          MENUITEM "&Outline\tCtrl+Shift+O",                     stylemenu+outlineitem
          MENUITEM "&Shadow\tCtrl+Shift+S",                      stylemenu+shadowitem
+ #endif
          MENUITEM "Superscript",                 stylemenu+superscriptitem
          MENUITEM "Subscript",                   stylemenu+subscriptitem

[frontierkernel-commits] Frontier/Common/source scripts.c,1.6,1.7,

[creedon <icr...@us...>]

Update of /cvsroot/frontierkernel/Frontier/Common/source
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18882

Modified Files:
	scripts.c 
Log Message:
enable script.(get/set)Language to minimally function on Windows

Index: scripts.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/scripts.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** scripts.c	8 Feb 2006 20:31:36 -0000	1.6
--- scripts.c	23 Feb 2006 04:53:38 -0000	1.7
***************
*** 4003,4007 ****
  	
  	/*
! 
  
  	visit all OSA servers and find the name of the one who's subtype 
--- 4003,4008 ----
  	
  	/*
! 	2006-02-22 creedon: if flcomponent is false then fallback to hard coded
! 				values, useful on Windows
  
  	visit all OSA servers and find the name of the one who's subtype 
***************
*** 4019,4022 ****
--- 4020,4035 ----
  #ifdef flcomponent
  	scriptvisitservers (&scriptfindsubtypevisit, (long) &cbd);
+ #else
+ 	switch (signature) {
+ 		case typeLAND:
+ 			copystring ("\x08" "UserTalk", bsname);
+ 			break;
+ 
+ 		case 'ascr':
+ 			copystring ("\x0B" "AppleScript", bsname);
+ 			break;
+ 		} /* switch */
+ 
+ 	
  #endif
  	
***************
*** 4043,4047 ****
  	
  	/*
! 	visit all OSA servers and find the subtype of the one who's name 
  	matches bsname
  	*/
--- 4056,4063 ----
  	
  	/*
! 	2006-02-22 creedon: if flcomponent is false then fallback to hard coded
! 				values, useful on Windows
! 
! 	visit all OSA servers and find the subtype of the one who's name
  	matches bsname
  	*/
***************
*** 4061,4065 ****
  	return (cbd.signature != 0);
  #else
! 	return (false);
  #endif
  	} /*scriptgetnametype*/
--- 4077,4090 ----
  	return (cbd.signature != 0);
  #else
! 	if (comparestrings (bsname, "\x08" "UserTalk") == 0) {
! 		*signature = typeLAND;
! 		return (true);
! 	}
! 	else if (comparestrings (bsname, "\x0B" "AppleScript") == 0) {
! 		*signature = 'ascr';
! 		return (true);
! 	}
! 	else
! 		return (false);
  #endif
  	} /*scriptgetnametype*/

[frontierkernel-commits] Frontier/Common/resources/Win32 WinLand.rc,1.16,1.17,

[creedon <icr...@us...>]

Update of /cvsroot/frontierkernel/Frontier/Common/resources/Win32
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14166

Modified Files:
	WinLand.rc 
Log Message:
remove UserLand from most resources

Index: WinLand.rc
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/resources/Win32/WinLand.rc,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** WinLand.rc	11 Feb 2006 14:40:35 -0000	1.16
--- WinLand.rc	23 Feb 2006 04:43:24 -0000	1.17
***************
*** 658,662 ****
      CONTROL         IDB_FRONTIER_BITMAP,IDC_STATIC,"Static",SS_BITMAP |
                      SS_SUNKEN,17,5,32,32
!     CTEXT           "Please personalize your copy of UserLand Frontier™.",
                      IDC_STATIC,74,7,101,20
  END
--- 658,662 ----
      CONTROL         IDB_FRONTIER_BITMAP,IDC_STATIC,"Static",SS_BITMAP |
                      SS_SUNKEN,17,5,32,32
!     CTEXT           "Please personalize your copy of Frontier™.",
                      IDC_STATIC,74,7,101,20
  END
***************
*** 861,865 ****
  #endif  // OPMLEDITOR
  #else
!             VALUE "FileDescription", "UserLand Frontier\0"
  #endif
  #ifdef fltrialsize
--- 861,865 ----
  #endif  // OPMLEDITOR
  #else
!             VALUE "FileDescription", "Frontier\0"
  #endif
  #ifdef fltrialsize
***************
*** 1019,1023 ****
  #endif  //OPMLEDITOR
  #else
! 	1 Defaults DISCARDABLE BEGIN "UserLand Frontier®\0" END
  #endif
  	2 Defaults DISCARDABLE BEGIN "Untitled\0" END
--- 1019,1023 ----
  #endif  //OPMLEDITOR
  #else
! 	1 Defaults DISCARDABLE BEGIN "Frontier\0" END
  #endif
  	2 Defaults DISCARDABLE BEGIN "Untitled\0" END
***************
*** 1649,1657 ****
  	4 Home_Window_Buttons DISCARDABLE BEGIN "Tech Support\0" END
  
! 	1 component DISCARDABLE BEGIN "UserLand Frontier®\0" END
  	2 component DISCARDABLE BEGIN "UserTalk\0" END
! 	3 component DISCARDABLE BEGIN "UserLand Frontier® UserTalk scripting component\0" END
! 	4 component DISCARDABLE BEGIN "UserLand Frontier® Menu Sharing component\0" END
! 	5 component DISCARDABLE BEGIN "UserLand Frontier® Window Sharing component\0" END
  
  
--- 1649,1657 ----
  	4 Home_Window_Buttons DISCARDABLE BEGIN "Tech Support\0" END
  
! 	1 component DISCARDABLE BEGIN "Frontier\0" END
  	2 component DISCARDABLE BEGIN "UserTalk\0" END
! 	3 component DISCARDABLE BEGIN "Frontier UserTalk scripting component\0" END
! 	4 component DISCARDABLE BEGIN "Frontier Menu Sharing component\0" END
! 	5 component DISCARDABLE BEGIN "Frontier Window Sharing component\0" END
  
  

[frontierkernel-commits] Frontier/Common/source langlist.c,1.7,1.8,

[Andre R. <and...@us...>]

Update of /cvsroot/frontierkernel/Frontier/Common/source
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29116/Common/source

Modified Files:
	langlist.c 
Log Message:
Use handlestream in listtostring to build the string representation, in preparation for removing the 255-char limit on individual string/record items.

Index: langlist.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/langlist.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** langlist.c	11 Jan 2005 22:48:07 -0000	1.7
--- langlist.c	20 Feb 2006 21:56:27 -0000	1.8
***************
*** 292,295 ****
--- 292,298 ----
  	
  	4/2/93 dmb: next version: 255-char limit for individual items only.
+ 	
+ 	2006-02-20 aradke: rewrite using handlestreams for efficiency.
+ 		also in preparation for revoming the 255-char limit for list items.
  	*/
  	
***************
*** 298,307 ****
  	tyvaluerecord itemval;
  	bigstring bs;
! 	Handle hstring;
  	boolean flisrecord = opgetisrecord (hlist);
  	
  	n = opcountlistitems (hlist);
  	
! 	if (!newtexthandle ("\x01{", &hstring))
  		return (false);
  	
--- 301,312 ----
  	tyvaluerecord itemval;
  	bigstring bs;
! 	handlestream s;
  	boolean flisrecord = opgetisrecord (hlist);
  	
  	n = opcountlistitems (hlist);
  	
! 	openhandlestream (nil, &s);
! 	
! 	if (!writehandlestreamchar (&s, '{'))	/* creates handle, need to dispose later */
  		return (false);
  	
***************
*** 312,327 ****
  		
  		if (flisrecord) {
  			
  			langdeparsestring (key, chdoublequote); /*add needed escape sequences*/
  			
! 			setstringwithchar (chdoublequote, bs);
! 			
! 			pushstring (key, bs);
! 			
! 			pushchar (chdoublequote, bs);
! 			
! 			pushchar (':', bs);
! 			
! 			pushtexthandle (bs, hstring);
  			}
  		
--- 317,334 ----
  		
  		if (flisrecord) {
+ 				
+ 			if (!writehandlestreamchar (&s, chdoublequote))
+ 				goto error;
  			
  			langdeparsestring (key, chdoublequote); /*add needed escape sequences*/
  			
! 			if (!writehandlestreamstring (&s, key))
! 				goto error;
! 				
! 			if (!writehandlestreamchar (&s, chdoublequote))
! 				goto error;
! 				
! 			if (!writehandlestreamchar (&s, ':'))
! 				goto error;
  			}
  		
***************
*** 331,349 ****
  		disposevaluerecord (itemval, true); /*don't clog temp stack*/
  		
! 		if (i < n)
! 			pushstring ("\x02, ", bs);
! 		
! 		if (!pushtexthandle (bs, hstring))
  			goto error;
  		}
  	
! 	if (!pushtexthandle ("\x01}", hstring))
  		goto error;
  	
! 	return (setheapvalue (hstring, stringvaluetype, val));
  	
  	error:
  	
! 	disposehandle (hstring);
  	
  	return (false);
--- 338,357 ----
  		disposevaluerecord (itemval, true); /*don't clog temp stack*/
  		
! 		if (!writehandlestreamstring (&s, bs))
  			goto error;
+ 		
+ 		if (i < n)
+ 			if (!writehandlestreamstring (&s, "\x02, "))
+ 				goto error;
  		}
  	
! 	if (!writehandlestreamchar (&s, '}'))
  		goto error;
  	
! 	return (setheapvalue (closehandlestream (&s), stringvaluetype, val));
  	
  	error:
  	
! 	disposehandlestream (&s);
  	
  	return (false);

[frontierkernel-commits] odbs/frontierRoot/system/verbs/builtins/rootUpdates update,1.4,1.5,

[creedon <icr...@us...>]

Update of /cvsroot/frontierkernel/odbs/frontierRoot/system/verbs/builtins/rootUpdates
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23626

Modified Files:
	update 
Log Message:
when initializing a server use Frontier.data.initialLastUpdateTime to set lastupdate

minor script formatting tweaks

make sure path to new part exists before trying to assign it, accommodate using a cvs repository as a backend

Index: update
===================================================================
RCS file: /cvsroot/frontierkernel/odbs/frontierRoot/system/verbs/builtins/rootUpdates/update,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** update	18 Feb 2006 18:34:32 -0000	1.4
--- update	19 Feb 2006 22:51:15 -0000	1.5
***************
*** 1,3 ****
  FrontierVcsFile:1:scpt:system.verbs.builtins.rootUpdates.update
  
! on update (adrInRoot = table.getcursoraddress (), flQuietMode=false, adrCtNewParts=nil) {
	ÇChanges
		Ç2/16/06; 6:27:30 PM by TAC
			Çwhen getting an update for the host database (@root) send paramaters just like when updating a guest database, except dbName is any empty string
		Ç12/23/05; 9:45:17 PM by TAC
			Çupdated root update code
		Ç6/13/05; 12:53:52 PM by TAC
			Çdisabled trial version and serial number checks
		Ç1/12/04; 12:48:36 AM by JES
			ÇChanged default updates server from madrid.userland.com to updates.userland.com.
		Ç2002
			Ç8/28/02; 10:48:23 PM by JES
				ÇAdded support for two new callbacks:
				Çuser.rootUpdates.callbacks.beforeInstallPart -- scripts in this table are called with two parameters: the address of the part, and the change note. If any script returns false, then the part is not installed. No error is generated -- it's up to the callback script to provide feedback to the user.
				Çuser.rootUpdates.callbacks.afterInstallPart -- scripts in this table are called with two parameters: the address of the part, and the change note. The return value is ignored.
			Ç4/16/02; 4:34:53 PM by JES
				ÇBug fix: Store the new part count in adrCtNewParts^ even if no new parts were loaded.
			Ç1/21/02; 2:25:42 PM by JES
				ÇUse a string comparison to determine whether we're getting updates from radioupdates.userland.com, instead of a call to tcp.equalNames, since tcp.equalNames fails for some proxy server users.
			Ç1/7/02; 9:09:40 PM by PBS
				ÇIf getting Radio updates from radioupdates.userland.com, send your usernum as an additional parameter.
		Ç8/6/01; 2:22:37 PM by PBS
			ÇWhen updating Manila or mainResponder, send the serial number.
		Ç01/21/01; 6:03:11 PM by JES
			ÇAdded optional parameter, adrCtNewParts. If not nil, the number of updated parts is assigned to adrCtNewParts^.
		Ç08/20/00; 11:49:35 AM by PBS
			ÇIf the server returns a last update time, use that instead of clock.now (). This fixes problems with people missing updates due to having clocks out-of-synch with the server. This way, the server's time is always used.
		Ç06/17/00; 11:16:23 PM by PBS
			ÇUse new root updates timeout pref.
		Ç11/16/99; 1:43:53 AM AM by AR
			ÇMake sure backup folder exists before backing up GDBs.
			ÇAdded flQuietMode parameter, defaulting to false. If it's true, we suppress all server-unfriendly interaction like putting up dialogs or opening the outline of new parts, regardless of the settings in user.rootUpdates.
		Ç10/7/99; 6:43:29 PM by DW
			ÇNew pref, user.rootupdates.prefs.flShowUpdatesToUser, defaults true, initialized in rootUpdates.init.
			ÇNew pref, user.rootupdates.prefs.adrOutlineForUser, defaults to @user.rootUpdates.updateOutline.
			Çif flShowUpdatesToUser is true, we create the outline if it doesn't exist and add a top-level headline with the date and time and the name of the database being updated. Each subordinate entry is the address of an object that's been updated. Underneath the address is the explanation of the change, if available.
	
	Çbundle // trial
		Çif defined (userland.trialVersionCheck)
			Çif userland.trialVersionCheck ()
				ÇscriptError ("Can't update the database because the trial period has expired.")
	
	rootUpdates.init ();
	
	local (adrroot = table.getrootaddress (adrInRoot));
	local (alist = string.parseaddress (adrroot));
	local (f = window.getFile (alist [1]));
	local (fname = file.filefrompath (f));
	
	if not string.lower (fname) endswith ".root" {
		scripterror ("Can't update the file because its name doesn't end with .root.")};
	
	local (channelname = string.mid (fname, 1, sizeof (fname) - 5));
	local (adrtable = @user.rootUpdates.servers.[channelname]);
	
	if not defined (adrtable^) {
		new (tabletype, adrtable);
		
		adrtable^.server = "rootUpdates.frontierOpenSource.editHere.com";
		adrtable^.port = 8081;
		adrtable^.method = "mainResponder.subscriptions.update";
		adrtable^.dbname = fname;
		
		adrtable^.lastupdate = "Sun, 01 Jan 2006 08:00:00 GMT"; //indicate that it's never been updated
		
		adrtable^.autobackup = true; //if true the backup will be of docServer.root, not Frontier.root
		adrtable^.dialogs = true; //set this false if you're updating automatically thru the scheduler
		adrtable^.openLog = true; //show the log file of changes
		
		adrtable^.URL = ""};
	Çelse
		Çif string.lower (adrtable^.server) == "madrid.userland.com"
			Çadrtable^.server = "updates.userland.com"
	Çbundle //the responder name on the server changed
		Çif adrtable^.method == "mainResponder.subscriptions.update"
			Çadrtable^.method = "nirvanaServer.subscriptions.update"
	on getUpdate (serverName, adrInRoot = nil) { //an enhanced version of rootupdates.getUpdate
		Ç10/18/98; 11:33:30 AM by DW
			ÇMade it guest database-aware.
			ÇIf adrInRoot is specified, it's assumed to point into the guest db that's getting updated
			ÇAdded a field to the prefs record, dbname, which names the guest database that's being shared
				ÇIt's an index into user.mainresponder.databases on the server.
			ÇThe handler for this is at mainresponder.rpchandlers.subscriptions.update.
		
		local (frontierVersion = Frontier.version ());
		local (platform = string.mid (sys.os (), 1, 3));
		local (ctnewparts = 0);
		local (flDialogs = true);
		local (flLogOutlineOpened = false, flNewLogOutline = false);
		
		local (adrPrefs = @user.rootUpdates.servers.[serverName]);
		
		local (flGuestDb = false, addressprefixstring); //10/18/98 DW
		bundle { //gather info about guest database
			if adrInRoot != nil and string.lower (channelname) != "frontier" {
				addressprefixstring = string (table.getRootAddress (adrInRoot));
				flGuestDb = true}};
		
		if defined (adrPrefs^.dialogs) and not adrPrefs^.dialogs {
			flDialogs = false};
		if flQuietMode { //AR 11/15/1999
			flDialogs = false};
		
		Çif not defined (user.prefs.serialNumber) // 6/13/05; 12:53:52 PM by TAC - disabled
			Çuser.prefs.serialNumber = ""
		
		try { //try to get the root update from the server
			if flDialogs {
				local (prompt = "Connect with " + adrPrefs^.server + " to get latest update");
				if flGuestDb {
					prompt = prompt + " of " + adrPrefs^.dbname};
				prompt = prompt + "?";
				if not dialog.confirm (prompt) {
					return (false)}};
			window.about ();
			local (sn = 0);
			Çif adrPrefs == @user.rootUpdates.servers.Frontier
				ÇOnly send Frontier serial number when getting Frontier.root udpate.
					ÇThu, Mar 18, 1999 at 3:21:10 PM by PBS
				Çsn = user.prefs.serialNumber
			local (rpcPath = user.betty.prefs.rpcClientDefaultPath);
			Çbundle // 6/13/05; 12:53:52 PM by TAC - disabled, no serial number check needed for open source release
				Çcase true //PBS 08/06/01: send serial number for Frontier, Manila, and mainResponder
					ÇadrPrefs == @user.rootUpdates.servers.Radio
					ÇadrPrefs == @user.rootUpdates.servers.radioCommunityServer
					ÇadrPrefs == @user.rootUpdates.servers.serverMonitor
					ÇadrPrefs == @user.rootUpdates.servers.Prefs
					ÇadrPrefs == @user.rootUpdates.servers.Frontier
					ÇadrPrefs == @user.rootUpdates.servers.Manila
					ÇadrPrefs == @user.rootUpdates.servers.mainResponder
						Çsn = user.prefs.serialNumber
						Çif string.lower (adrPrefs^.server) endswith ".userland.com"
							Çtry //add path args to rpcPath
								Çlocal (args); new (tableType, @args)
								Çargs.org (xn--args-zoa.org) = user.prefs.organization
								Çargs.name = user.prefs.name
								Çargs.email = user.prefs.mailAddress
								Çargs.sn = user.prefs.serialNumber
								Çif defined (config.mainResponder.domains)
									Çargs.domains = sizeOf (config.mainResponder.domains)
								Çelse
									Çargs.domains = 0
								Çif defined (config.manila.sites)
									Çargs.sites = sizeOf (config.manila.sites)
								Çelse
									Çargs.sites = 0
								Çif defined (radioCommunityServerData.users)
									Çargs.rcsUsers = sizeOf (radioCommunityServerData.users)
								Çelse
									Çargs.rcsUsers = 0
								ÇrpcPath = rpcPath + "?" + webserver.encodeArgs (@args)
				Çelse
					Çif defined (adrPrefs^.serialNum)
						Çsn = adrPrefs^.serialNum
					Çelse
						Çsn = 0
			
			local (paramlist = {tcp.addressDecode (tcp.myAddress ()), adrPrefs^.lastupdate, platform, sn, user.prefs.name, user.prefs.mailAddress, frontierVersion});
			
			bundle { //PBS 01/07/02: send usernum to radioupdates.userland.com
				Çif tcp.equalNames (adrPrefs^.server, "radioupdates.userland.com")
					Çparamlist = paramlist + user.radio.prefs.usernum
				if string.lower (adrPrefs^.server) == "radioupdates.userland.com" {
					paramlist = paramlist + user.radio.prefs.usernum}};
			
			if flGuestDb {
				paramlist = {adrPrefs^.dbname} + paramlist}
			else {
				paramlist = {""} + paramlist}; // empty string indicates get host database (@root) update
			
			local (newpartstable);
			local (i);
			msg ("Connecting to " + adrPrefs^.server + " to get " + serverName + " update...");
			newpartstable = betty.rpc.client (adrPrefs^.server, adrPrefs^.port, adrPrefs^.method, @paramlist, false, rpcPath:rpcPath, ticksToTimeOut:user.rootUpdates.prefs.timeout);
			Çbundle //original call
				Çnewpartstable = betty.rpc.client (adrPrefs^.server, adrPrefs^.port, adrPrefs^.method, @paramlist, false, ticksToTimeOut:user.rootUpdates.prefs.timeout)
			if not defined (newPartsTable.parts) {
				if newPartsTable beginsWith "There are no new or changed parts available." or newPartsTable beginsWith "Your root is already updated" {
					msg ("");
					if flDialogs {
						dialog.notify (newPartsTable)}
					else {
						msg (newPartsTable)};
					if adrCtNewParts != nil { //4/16/02; 4:33:24 PM by JES: make the new part count available to the caller, even if there are no new parts
						adrCtNewParts^ = ctNewParts};
					return (true)}};
			if adrPrefs^.autobackup { //10/18/98; 11:36:58 AM by DW
				if flGuestDb {
					backups.init (); //make sure user.backups.folder is set
					local (alist = string.parseaddress (adrInRoot));
					local (source = alist [1]);
					filemenu.save (source);
					
					local (dest);
					bundle { //set dest to point at the destination file
						dest = file.filefrompath (source);
						if string.lower (dest) endswith ".root" {
							dest = string.delete (dest, sizeof (dest) - 4, 5); //pop off .root
							dest = dest + "." + user.backups.nextBackup + ".root"}
						else {
							dest = dest + "." + user.backups.nextBackup};
						dest = user.backups.folder + dest;
						user.backups.nextBackup++};
					file.sureFilePath (dest); //AR 11/15/1999
					file.copy (source, dest);
					filemenu.save ();
					msg (dest + " is " + string.megabytestring (file.size (dest)))}
				else {
					backups.backuproot ()}};
			for i = 1 to sizeof (newpartstable.parts) {
				local (adrnewpart = @newpartstable.parts [i]);
				local (bytes = binary (base64.decode (adrnewpart^)));
				local (flpartinstalled = true);
				setBinaryType (@bytes, tableType);
				unpack (@bytes, adrnewpart);
				on installPart (adrpart) {
					if defined (user.rootUpdates.protected) { //Don't import into these places.
						local (j);
						for j = 1 to sizeOf (user.rootUpdates.protected) {
							local (oneItem = address (user.rootUpdates.protected [j]));
							if table.tableContains (oneItem, adrpart^.adr) { //Don't install.
								flpartinstalled = false;
								return (true)}}};
					if defined (adrpart^.platform) {
						if string.lower (adrpart^.platform) != "both" { // Only install parts for this platform.
							if string.lower (adrpart^.platform) != string.lower (platform) {
								return (true)}}};
					try {
						if flGuestDb { //we got a relative address, convert it to a real address
							adrpart^.adr = address (addressprefixstring + "." + adrpart^.adr)};
						msg ("Importing " + adrpart^.adr + ".");
						local (adrcallback, ixcallback, ctcallbacks, flInstallPart = true);
						bundle { //call beforeInstallPart callbacks
							ctcallbacks = sizeOf (user.rootUpdates.callbacks.beforeInstallPart);
							for ixcallback = 1 to ctcallbacks {
								local (adrcallback = @user.rootUpdates.callbacks.beforeInstallPart[ixcallback] );
								try {
									while typeOf (adrcallback^) == addressType {
										adrcallback = adrcallback^};
									if not adrcallback^ (adrpart^.adr, string (adrpart^.changes) ) {
										flInstallPart = false;
										break}}}};
						if flInstallPart {
							adrpart^.adr^ = adrpart^.data};
						bundle { //call afterInstallPart callbacks
							ctcallbacks = sizeOf (user.rootUpdates.callbacks.afterInstallPart);
							for ixcallback = 1 to ctcallbacks {
								local (adrcallback = @user.rootUpdates.callbacks.afterInstallPart[ixcallback] );
								try {
									while typeOf (adrcallback^) == addressType {
										adrcallback = adrcallback^};
									adrcallback^ (adrpart^.adr, string (adrpart^.changes) )}}}}
					else {
						flpartinstalled = false;
						if flDialogs {
							if not dialog.yesNo ("Installation of \"" + adrpart^.adr + "\" failed. Continue installation?") {
								return (false)}}};
					
					local (logline);
					bundle { //clean up address so you can 2click on it
						logline = string (adrpart^.adr);
						local (ix = string.patternmatch ("].", logline));
						if ix != 0 {
							logline = string.delete (logline, 1, ix + 1)}};
					bundle { //log the update
						on cleanNote (s) {
							if s != "" {
								s = string.replaceAll (s, "\r\n", "\r");
								s = string.replace (s, ": ", ":\r");
								s = string.replaceAll (s, ". ", ".\r");
								s = string.replaceAll (s, "-- ", "--\r");
								s = "Changed " + s;
								s = string.replaceAll (s, "\r\r\r\r", "\r\r");
								s = string.replaceAll (s, "\r\r\r", "\r\r");
								s = string.popTrailing (s, "\r")};
							return (s)};
						local (changenote = cleanNote (string (adrpart^.changes)));
						export.addToLog (logline, adrPrefs^.url, changenote);
						
						if user.rootupdates.prefs.flShowUpdatesToUser {
							if not flLogOutlineOpened {
								if not defined (user.rootupdates.prefs.adrOutlineForUser^) {
									new (outlinetype, user.rootupdates.prefs.adrOutlineForUser);
									local (oldtarget = target.set (user.rootupdates.prefs.adrOutlineForUser));
									op.setLineText (user.rootupdates.prefs.adrOutlineForUser + " created on " + clock.now ());
									target.set (oldtarget);
									flNewLogOutline = true};
								local (oldtarget = target.set (user.rootupdates.prefs.adrOutlineForUser));
								op.firstSummit ();
								op.insert ("Updated " + fname + " on " + clock.now (), up);
								target.set (oldtarget);
								flLogOutlineOpened = true};
							
							local (oldtarget = target.set (user.rootupdates.prefs.adrOutlineForUser));
							op.insert (logline, right);
							if sizeof (changenote) > 0 {
								op.insert (changenote, right);
								op.go (left, 1);
								op.collapse ()};
							op.go (left, 1);
							target.set (oldtarget)}};
					
					return (true)};
				if not installPart (adrnewpart) {
					break};
				if flpartinstalled {
					ctnewparts++}};
			if defined (newPartsTable.lastUpdateTime) { //PBS 08/20/00: get last update time from server, if supplied
				adrPrefs^.lastUpdate = newPartsTable.lastUpdateTime}
			else { //PBS 08/20/00: fallback -- use clock.now () to set last update time
				adrPrefs^.lastUpdate = date.netStandardString (clock.now ())};
			
			adrPrefs^.serialNum = newPartsTable.serialNum;
			
			if flGuestDb {
				msg ("Saving " + adrPrefs^.dbname + "...");
				fileMenu.saveMyRoot (adrInRoot);
				msg ("")}
			else {
				menu.installMainMenu ();
				system.menus.buildSuitesSubMenu (); //re-build in case any new suites were imported.
				msg ("Saving Frontier.root...");
				fileMenu.save ();
				msg ("")};
			
			if flLogOutlineOpened and not flQuietMode {
				edit (user.rootupdates.prefs.adrOutlineForUser);
				if flNewLogOutline {
					window.zoom (user.rootupdates.prefs.adrOutlineForUser)}}
			else {
				thread.sleepFor (0);
				if ctnewparts == 1 {
					if flDialogs {
						dialog.alert ("1 new part loaded from \"" + adrPrefs^.server + "\".")}
					else {
						msg ("1 new part loaded from \"" + adrPrefs^.server + "\".")}}
				else {
					if flDialogs {
						dialog.alert (ctnewparts + " new parts loaded from \"" + adrPrefs^.server + "\".")}
					else {
						msg (ctnewparts + " new parts loaded from \"" + adrPrefs^.server + "\".")}}}}
		else { //handle errors
			on alert (message) {
				if flDialogs {
					return (dialog.alert (message))};
				scriptError (message)};
			local (lowerError = string.lower (tryerror));
			local (errmsg = "Can't update the root because ");
			case true {
				lowerError contains "socket is not connected" {
					alert (errmsg + "the server is not responding.")};
				lowerError contains "can't get the address of";
				lowerError contains "poorly formed xml text";
				lowerError contains "missing tag" {
					alert (errmsg + "the server timed out.")}}
			else {
				alert (errmsg + "\"" + tryError + ".\"")};
			return (false)};
		
		if adrCtNewParts != nil { //01/21/01 JES: make the new part count available to the caller
			adrCtNewParts^ = ctNewParts};
		return (true)};
	getUpdate (channelname, adrroot)};

Çbundle // testing
	Çupdate (@root)
\ No newline at end of file
--- 1,3 ----
  FrontierVcsFile:1:scpt:system.verbs.builtins.rootUpdates.update
  
! on update (adrInRoot = table.getcursoraddress (), flQuietMode=false, adrCtNewParts=nil) {
	ÇChanges
		Ç2/19/06; 1:49:03 PM by TAC
			Çwhen initializing a server use Frontier.data.initialLastUpdateTime to set lastupdate
			Çminor script formatting tweaks
			Çmake sure path to new part exists before trying to assign it, accommodate using a cvs repository as a backend
		Ç2/16/06; 6:27:30 PM by TAC
			Çwhen getting an update for the host database (@root) send paramaters just like when updating a guest database, except dbName is any empty string
		Ç12/23/05; 9:45:17 PM by TAC
			Çupdated root update code
		Ç6/13/05; 12:53:52 PM by TAC
			Çdisabled trial version and serial number checks
		Ç1/12/04; 12:48:36 AM by JES
			ÇChanged default updates server from madrid.userland.com to updates.userland.com.
		Ç2002
			Ç8/28/02; 10:48:23 PM by JES
				ÇAdded support for two new callbacks:
				Çuser.rootUpdates.callbacks.beforeInstallPart -- scripts in this table are called with two parameters: the address of the part, and the change note. If any script returns false, then the part is not installed. No error is generated -- it's up to the callback script to provide feedback to the user.
				Çuser.rootUpdates.callbacks.afterInstallPart -- scripts in this table are called with two parameters: the address of the part, and the change note. The return value is ignored.
			Ç4/16/02; 4:34:53 PM by JES
				ÇBug fix: Store the new part count in adrCtNewParts^ even if no new parts were loaded.
			Ç1/21/02; 2:25:42 PM by JES
				ÇUse a string comparison to determine whether we're getting updates from radioupdates.userland.com, instead of a call to tcp.equalNames, since tcp.equalNames fails for some proxy server users.
			Ç1/7/02; 9:09:40 PM by PBS
				ÇIf getting Radio updates from radioupdates.userland.com, send your usernum as an additional parameter.
		Ç8/6/01; 2:22:37 PM by PBS
			ÇWhen updating Manila or mainResponder, send the serial number.
		Ç01/21/01; 6:03:11 PM by JES
			ÇAdded optional parameter, adrCtNewParts. If not nil, the number of updated parts is assigned to adrCtNewParts^.
		Ç08/20/00; 11:49:35 AM by PBS
			ÇIf the server returns a last update time, use that instead of clock.now (). This fixes problems with people missing updates due to having clocks out-of-synch with the server. This way, the server's time is always used.
		Ç06/17/00; 11:16:23 PM by PBS
			ÇUse new root updates timeout pref.
		Ç11/16/99; 1:43:53 AM AM by AR
			ÇMake sure backup folder exists before backing up GDBs.
			ÇAdded flQuietMode parameter, defaulting to false. If it's true, we suppress all server-unfriendly interaction like putting up dialogs or opening the outline of new parts, regardless of the settings in user.rootUpdates.
		Ç10/7/99; 6:43:29 PM by DW
			ÇNew pref, user.rootupdates.prefs.flShowUpdatesToUser, defaults true, initialized in rootUpdates.init.
			ÇNew pref, user.rootupdates.prefs.adrOutlineForUser, defaults to @user.rootUpdates.updateOutline.
			Çif flShowUpdatesToUser is true, we create the outline if it doesn't exist and add a top-level headline with the date and time and the name of the database being updated. Each subordinate entry is the address of an object that's been updated. Underneath the address is the explanation of the change, if available.
	
	Çbundle // trial
		Çif defined (userland.trialVersionCheck)
			Çif userland.trialVersionCheck ()
				ÇscriptError ("Can't update the database because the trial period has expired.")
	
	rootUpdates.init ();
	
	local (adrroot = table.getrootaddress (adrInRoot));
	local (alist = string.parseaddress (adrroot));
	local (f = window.getFile (alist [1]));
	local (fname = file.filefrompath (f));
	
	if not string.lower (fname) endswith ".root" {
		scripterror ("Can't update the file because its name doesn't end with .root.")};
	
	local (channelname = string.mid (fname, 1, sizeof (fname) - 5));
	local (adrtable = @user.rootUpdates.servers.[channelname]);
	
	if not defined (adrtable^) {
		new (tabletype, adrtable);
		
		adrtable^.server = "rootUpdates.frontierOpenSource.editHere.com";
		adrtable^.port = 8081;
		adrtable^.method = "mainResponder.subscriptions.update";
		adrtable^.dbname = fname;
		
		adrtable^.lastupdate = Frontier.data.initialLastUpdateTime; //indicate that it's never been updated
		
		adrtable^.autobackup = true; //if true the backup will be of docServer.root, not Frontier.root
		adrtable^.dialogs = true; //set this false if you're updating automatically thru the scheduler
		adrtable^.openLog = true; //show the log file of changes
		
		adrtable^.URL = ""};
	Çelse
		Çif string.lower (adrtable^.server) == "madrid.userland.com"
			Çadrtable^.server = "updates.userland.com"
	Çbundle //the responder name on the server changed
		Çif adrtable^.method == "mainResponder.subscriptions.update"
			Çadrtable^.method = "nirvanaServer.subscriptions.update"
	on getUpdate (serverName, adrInRoot = nil) { //an enhanced version of rootupdates.getUpdate
		Ç10/18/98; 11:33:30 AM by DW
			ÇMade it guest database-aware.
			ÇIf adrInRoot is specified, it's assumed to point into the guest db that's getting updated
			ÇAdded a field to the prefs record, dbname, which names the guest database that's being shared
				ÇIt's an index into user.mainresponder.databases on the server.
			ÇThe handler for this is at mainresponder.rpchandlers.subscriptions.update.
		
		local (frontierVersion = Frontier.version ());
		local (platform = string.mid (sys.os (), 1, 3));
		local (ctnewparts = 0);
		local (flDialogs = true);
		local (flLogOutlineOpened = false, flNewLogOutline = false);
		
		local (adrPrefs = @user.rootUpdates.servers.[serverName]);
		
		local (flGuestDb = false, addressprefixstring); //10/18/98 DW
		bundle { //gather info about guest database
			if adrInRoot != nil and string.lower (channelname) != "frontier" {
				addressprefixstring = string (table.getRootAddress (adrInRoot));
				flGuestDb = true}};
		
		if defined (adrPrefs^.dialogs) and not adrPrefs^.dialogs {
			flDialogs = false};
		if flQuietMode { //AR 11/15/1999
			flDialogs = false};
		
		Çif not defined (user.prefs.serialNumber) // 6/13/05; 12:53:52 PM by TAC - disabled
			Çuser.prefs.serialNumber = ""
		
		try { //try to get the root update from the server
			if flDialogs {
				local (prompt = "Connect with " + adrPrefs^.server + " to get latest update");
				if flGuestDb {
					prompt = prompt + " of " + adrPrefs^.dbname};
				prompt = prompt + "?";
				if not dialog.confirm (prompt) {
					return (false)}};
			window.about ();
			local (sn = 0);
			Çif adrPrefs == @user.rootUpdates.servers.Frontier
				ÇOnly send Frontier serial number when getting Frontier.root udpate.
					ÇThu, Mar 18, 1999 at 3:21:10 PM by PBS
				Çsn = user.prefs.serialNumber
			local (rpcPath = user.betty.prefs.rpcClientDefaultPath);
			Çbundle // 6/13/05; 12:53:52 PM by TAC - disabled, no serial number check needed for open source release
				Çcase true //PBS 08/06/01: send serial number for Frontier, Manila, and mainResponder
					ÇadrPrefs == @user.rootUpdates.servers.Radio
					ÇadrPrefs == @user.rootUpdates.servers.radioCommunityServer
					ÇadrPrefs == @user.rootUpdates.servers.serverMonitor
					ÇadrPrefs == @user.rootUpdates.servers.Prefs
					ÇadrPrefs == @user.rootUpdates.servers.Frontier
					ÇadrPrefs == @user.rootUpdates.servers.Manila
					ÇadrPrefs == @user.rootUpdates.servers.mainResponder
						Çsn = user.prefs.serialNumber
						Çif string.lower (adrPrefs^.server) endswith ".userland.com"
							Çtry //add path args to rpcPath
								Çlocal (args); new (tableType, @args)
								Çargs.org (xn--args-zoa.org) = user.prefs.organization
								Çargs.name = user.prefs.name
								Çargs.email = user.prefs.mailAddress
								Çargs.sn = user.prefs.serialNumber
								Çif defined (config.mainResponder.domains)
									Çargs.domains = sizeOf (config.mainResponder.domains)
								Çelse
									Çargs.domains = 0
								Çif defined (config.manila.sites)
									Çargs.sites = sizeOf (config.manila.sites)
								Çelse
									Çargs.sites = 0
								Çif defined (radioCommunityServerData.users)
									Çargs.rcsUsers = sizeOf (radioCommunityServerData.users)
								Çelse
									Çargs.rcsUsers = 0
								ÇrpcPath = rpcPath + "?" + webserver.encodeArgs (@args)
				Çelse
					Çif defined (adrPrefs^.serialNum)
						Çsn = adrPrefs^.serialNum
					Çelse
						Çsn = 0
			
			local (paramlist = {tcp.addressDecode (tcp.myAddress ()), adrPrefs^.lastupdate, platform, sn, user.prefs.name, user.prefs.mailAddress, frontierVersion});
			
			bundle { //PBS 01/07/02: send usernum to radioupdates.userland.com
				Çif tcp.equalNames (adrPrefs^.server, "radioupdates.userland.com")
					Çparamlist = paramlist + user.radio.prefs.usernum
				if string.lower (adrPrefs^.server) == "radioupdates.userland.com" {
					paramlist = paramlist + user.radio.prefs.usernum}};
			
			if flGuestDb {
				paramlist = {adrPrefs^.dbname} + paramlist}
			else {
				paramlist = {""} + paramlist}; // empty string indicates get host database (@root) update
			
			local (newpartstable);
			local (i);
			msg ("Connecting to " + adrPrefs^.server + " to get " + serverName + " update...");
			newpartstable = betty.rpc.client (adrPrefs^.server, adrPrefs^.port, adrPrefs^.method, @paramlist, false, rpcPath:rpcPath, ticksToTimeOut:user.rootUpdates.prefs.timeout);
			Çbundle //original call
				Çnewpartstable = betty.rpc.client (adrPrefs^.server, adrPrefs^.port, adrPrefs^.method, @paramlist, false, ticksToTimeOut:user.rootUpdates.prefs.timeout)
			if not defined (newPartsTable.parts) {
				if newPartsTable beginsWith "There are no new or changed parts available." or newPartsTable beginsWith "Your root is already updated" {
					msg ("");
					if flDialogs {
						dialog.notify (newPartsTable)}
					else {
						msg (newPartsTable)};
					if adrCtNewParts != nil { //4/16/02; 4:33:24 PM by JES: make the new part count available to the caller, even if there are no new parts
						adrCtNewParts^ = ctNewParts};
					return (true)}};
			if adrPrefs^.autobackup { //10/18/98; 11:36:58 AM by DW
				if flGuestDb {
					backups.init (); //make sure user.backups.folder is set
					local (alist = string.parseaddress (adrInRoot));
					local (source = alist [1]);
					filemenu.save (source);
					
					local (dest);
					bundle { //set dest to point at the destination file
						dest = file.filefrompath (source);
						if string.lower (dest) endswith ".root" {
							dest = string.delete (dest, sizeof (dest) - 4, 5); //pop off .root
							dest = dest + "." + user.backups.nextBackup + ".root"}
						else {
							dest = dest + "." + user.backups.nextBackup};
						dest = user.backups.folder + dest;
						user.backups.nextBackup++};
					file.sureFilePath (dest); //AR 11/15/1999
					file.copy (source, dest);
					filemenu.save ();
					msg (dest + " is " + string.megabytestring (file.size (dest)))}
				else {
					backups.backuproot ()}};
			for i = 1 to sizeof (newpartstable.parts) {
				local (adrnewpart = @newpartstable.parts [i]);
				local (bytes = binary (base64.decode (adrnewpart^)));
				local (flpartinstalled = true);
				setBinaryType (@bytes, tableType);
				unpack (@bytes, adrnewpart);
				on installPart (adrPart) {
					if defined (user.rootUpdates.protected) { //Don't import into these places.
						local (j);
						for j = 1 to sizeOf (user.rootUpdates.protected) {
							local (oneItem = address (user.rootUpdates.protected [j]));
							if table.tableContains (oneItem, adrPart^.adr) { //Don't install.
								flpartinstalled = false;
								return (true)}}};
					if defined (adrPart^.platform) {
						if string.lower (adrPart^.platform) != "both" { // Only install parts for this platform.
							if string.lower (adrPart^.platform) != string.lower (platform) {
								return (true)}}};
					try {
						if flGuestDb { //we got a relative address, convert it to a real address
							adrPart^.adr = address (addressprefixstring + "." + adrPart^.adr)};
						msg ("Importing " + adrPart^.adr + ".");
						local (adrcallback, ixcallback, ctcallbacks, flInstallPart = true);
						bundle { //call beforeInstallPart callbacks
							ctcallbacks = sizeOf (user.rootUpdates.callbacks.beforeInstallPart);
							for ixcallback = 1 to ctcallbacks {
								local (adrcallback = @user.rootUpdates.callbacks.beforeInstallPart[ixcallback] );
								try {
									while typeOf (adrcallback^) == addressType {
										adrcallback = adrcallback^};
									if not adrcallback^ (adrPart^.adr, string (adrPart^.changes) ) {
										flInstallPart = false;
										break}}}};
						
						if flInstallPart {
							if not (defined (@adrPart^.adr^)) { // make sure path to item exists
								local (addressList = string.parseAddress (adrPart^.adr), ct, item, nomad);
								
								bundle { // prime nomad
									if flGuestDb {
										nomad = @[addressList [1]];
										delete (@addressList [1])}
									else {
										nomad = @root}};
								
								ct = sizeOf (addressList);
								
								if ct != 1 {
									delete (@addressList [ct])};
								
								for item in addressList {
									nomad = @nomad^.[item];
									
									if not (defined (nomad^)) {
										new (tableType, nomad)}}};
							
							adrPart^.adr^ = adrPart^.data};
						
						bundle { //call afterInstallPart callbacks
							ctcallbacks = sizeOf (user.rootUpdates.callbacks.afterInstallPart);
							for ixcallback = 1 to ctcallbacks {
								local (adrcallback = @user.rootUpdates.callbacks.afterInstallPart[ixcallback] );
								try {
									while typeOf (adrcallback^) == addressType {
										adrcallback = adrcallback^};
									adrcallback^ (adrPart^.adr, string (adrPart^.changes) )}}}}
					else {
						flpartinstalled = false;
						if flDialogs {
							if not dialog.yesNo ("Installation of \"" + adrPart^.adr + "\" failed. Continue installation?") {
								return (false)}}};
					
					local (logline);
					bundle { //clean up address so you can 2click on it
						logline = string (adrPart^.adr);
						local (ix = string.patternmatch ("].", logline));
						if ix != 0 {
							logline = string.delete (logline, 1, ix + 1)}};
					bundle { //log the update
						on cleanNote (s) {
							if s != "" {
								s = string.replaceAll (s, "\r\n", "\r");
								s = string.replace (s, ": ", ":\r");
								s = string.replaceAll (s, ". ", ".\r");
								s = string.replaceAll (s, "-- ", "--\r");
								s = "Changed " + s;
								s = string.replaceAll (s, "\r\r\r\r", "\r\r");
								s = string.replaceAll (s, "\r\r\r", "\r\r");
								s = string.popTrailing (s, "\r")};
							return (s)};
						local (changenote = cleanNote (string (adrPart^.changes)));
						export.addToLog (logline, adrPrefs^.url, changenote);
						
						if user.rootupdates.prefs.flShowUpdatesToUser {
							if not flLogOutlineOpened {
								if not defined (user.rootupdates.prefs.adrOutlineForUser^) {
									new (outlinetype, user.rootupdates.prefs.adrOutlineForUser);
									local (oldtarget = target.set (user.rootupdates.prefs.adrOutlineForUser));
									op.setLineText (user.rootupdates.prefs.adrOutlineForUser + " created on " + clock.now ());
									target.set (oldtarget);
									flNewLogOutline = true};
								local (oldtarget = target.set (user.rootupdates.prefs.adrOutlineForUser));
								op.firstSummit ();
								op.insert ("Updated " + fname + " on " + clock.now (), up);
								target.set (oldtarget);
								flLogOutlineOpened = true};
							
							local (oldtarget = target.set (user.rootupdates.prefs.adrOutlineForUser));
							op.insert (logline, right);
							if sizeof (changenote) > 0 {
								op.insert (changenote, right);
								op.go (left, 1);
								op.collapse ()};
							op.go (left, 1);
							target.set (oldtarget)}};
					
					return (true)};
				if not installPart (adrnewpart) {
					break};
				if flpartinstalled {
					ctnewparts++}};
			if defined (newPartsTable.lastUpdateTime) { //PBS 08/20/00: get last update time from server, if supplied
				adrPrefs^.lastUpdate = newPartsTable.lastUpdateTime}
			else { //PBS 08/20/00: fallback -- use clock.now () to set last update time
				adrPrefs^.lastUpdate = date.netStandardString (clock.now ())};
			
			adrPrefs^.serialNum = newPartsTable.serialNum;
			
			if flGuestDb {
				msg ("Saving " + adrPrefs^.dbname + "...");
				fileMenu.saveMyRoot (adrInRoot);
				msg ("")}
			else {
				menu.installMainMenu ();
				system.menus.buildSuitesSubMenu (); //re-build in case any new suites were imported.
				msg ("Saving Frontier.root...");
				fileMenu.save ();
				msg ("")};
			
			if flLogOutlineOpened and not flQuietMode {
				edit (user.rootupdates.prefs.adrOutlineForUser);
				if flNewLogOutline {
					window.zoom (user.rootupdates.prefs.adrOutlineForUser)}}
			else {
				thread.sleepFor (0);
				if ctnewparts == 1 {
					if flDialogs {
						dialog.alert ("1 new part loaded from \"" + adrPrefs^.server + "\".")}
					else {
						msg ("1 new part loaded from \"" + adrPrefs^.server + "\".")}}
				else {
					if flDialogs {
						dialog.alert (ctnewparts + " new parts loaded from \"" + adrPrefs^.server + "\".")}
					else {
						msg (ctnewparts + " new parts loaded from \"" + adrPrefs^.server + "\".")}}}}
		else { //handle errors
			on alert (message) {
				if flDialogs {
					return (dialog.alert (message))};
				scriptError (message)};
			local (lowerError = string.lower (tryerror));
			local (errmsg = "Can't update the root because ");
			case true {
				lowerError contains "socket is not connected" {
					alert (errmsg + "the server is not responding.")};
				lowerError contains "can't get the address of";
				lowerError contains "poorly formed xml text";
				lowerError contains "missing tag" {
					alert (errmsg + "the server timed out.")}}
			else {
				alert (errmsg + "\"" + tryError + ".\"")};
			return (false)};
		
		if adrCtNewParts != nil { //01/21/01 JES: make the new part count available to the caller
			adrCtNewParts^ = ctNewParts};
		return (true)};
	getUpdate (channelname, adrroot)};

Çbundle // testing
	Çupdate (@root)
\ No newline at end of file

[frontierkernel-commits] odbs/frontierRoot/suites/fUnit/testTables/data/sortWeights 3F3F3F3F,NONE,1.1, QDpt,NONE,1.1, TEXT,NONE,1.1, addr,NONE,1.1, alis,NONE,1.1, bool,NONE,1.1, cRGB,NONE,1.1, card,NONE,1.1, char,NONE,1.1, code,NONE,1.1, data,NONE,1.1, date,NONE,1.1, dir20,NONE,1.1, enum,NONE,1.1, exte,NONE,1.1, fixd,NONE,1.1, fss20,NONE,1.1, list,NONE,1.1, long,NONE,1.1, mbar,NONE,1.1, obj20,NONE,1.1, optx,NONE,1.1, pict,NONE,1.1, qdrt,NONE,1.1, reco,NONE,1.1, scpt,NONE,1.1, shor,NONE,1.1, sing,NONE,1.1, tabl,NONE,1.1, tokn,NONE,1.1, tptn,NONE,1.1, type,NONE,1.1, wptx,NONE,1.1,

[Andre R. <and...@us...>]

Update of /cvsroot/frontierkernel/odbs/frontierRoot/suites/fUnit/testTables/data/sortWeights
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24924/data/sortWeights

Added Files:
	3F3F3F3F QDpt TEXT addr alis bool cRGB card char code data 
	date dir20 enum exte fixd fss20 list long mbar obj20 optx pict 
	qdrt reco scpt shor sing tabl tokn tptn type wptx 
Log Message:
Add test suite for verifying various aspects of the table value type.

--- NEW FILE: shor ---
FrontierVcsFile:1:long:suites.fUnit.testTables.data.sortWeights.shor

2
--- NEW FILE: code ---
FrontierVcsFile:1:long:suites.fUnit.testTables.data.sortWeights.code

10
--- NEW FILE: TEXT ---
FrontierVcsFile:1:long:suites.fUnit.testTables.data.sortWeights.TEXT

12
--- NEW FILE: char ---
FrontierVcsFile:1:long:suites.fUnit.testTables.data.sortWeights.char

1
--- NEW FILE: fss20 ---
FrontierVcsFile:1:long:suites.fUnit.testTables.data.sortWeights.["fss "]

26
--- NEW FILE: tabl ---
FrontierVcsFile:1:long:suites.fUnit.testTables.data.sortWeights.tabl

31
--- NEW FILE: obj20 ---
FrontierVcsFile:1:long:suites.fUnit.testTables.data.sortWeights.["obj "]

25
--- NEW FILE: addr ---
FrontierVcsFile:1:long:suites.fUnit.testTables.data.sortWeights.addr

9
--- NEW FILE: data ---
FrontierVcsFile:1:long:suites.fUnit.testTables.data.sortWeights.data

5
--- NEW FILE: scpt ---
FrontierVcsFile:1:long:suites.fUnit.testTables.data.sortWeights.scpt

32
--- NEW FILE: long ---
FrontierVcsFile:1:long:suites.fUnit.testTables.data.sortWeights.long

3
--- NEW FILE: bool ---
FrontierVcsFile:1:long:suites.fUnit.testTables.data.sortWeights.bool

6
--- NEW FILE: qdrt ---
FrontierVcsFile:1:long:suites.fUnit.testTables.data.sortWeights.qdrt

19
--- NEW FILE: tptn ---
FrontierVcsFile:1:long:suites.fUnit.testTables.data.sortWeights.tptn

20
--- NEW FILE: type ---
FrontierVcsFile:1:long:suites.fUnit.testTables.data.sortWeights.type

16
--- NEW FILE: 3F3F3F3F ---
FrontierVcsFile:1:long:suites.fUnit.testTables.data.sortWeights.["????"]

0
--- NEW FILE: reco ---
FrontierVcsFile:1:long:suites.fUnit.testTables.data.sortWeights.reco

30
--- NEW FILE: enum ---
FrontierVcsFile:1:long:suites.fUnit.testTables.data.sortWeights.enum

28
--- NEW FILE: QDpt ---
FrontierVcsFile:1:long:suites.fUnit.testTables.data.sortWeights.QDpt

18
--- NEW FILE: date ---
FrontierVcsFile:1:long:suites.fUnit.testTables.data.sortWeights.date

8
--- NEW FILE: sing ---
FrontierVcsFile:1:long:suites.fUnit.testTables.data.sortWeights.sing

23
--- NEW FILE: fixd ---
FrontierVcsFile:1:long:suites.fUnit.testTables.data.sortWeights.fixd

22
--- NEW FILE: mbar ---
FrontierVcsFile:1:long:suites.fUnit.testTables.data.sortWeights.mbar

36
--- NEW FILE: wptx ---
FrontierVcsFile:1:long:suites.fUnit.testTables.data.sortWeights.wptx

33
--- NEW FILE: card ---
FrontierVcsFile:1:long:suites.fUnit.testTables.data.sortWeights.card

37
--- NEW FILE: cRGB ---
FrontierVcsFile:1:long:suites.fUnit.testTables.data.sortWeights.cRGB

21
--- NEW FILE: pict ---
FrontierVcsFile:1:long:suites.fUnit.testTables.data.sortWeights.pict

34
--- NEW FILE: list ---
FrontierVcsFile:1:long:suites.fUnit.testTables.data.sortWeights.list

29
--- NEW FILE: exte ---
FrontierVcsFile:1:long:suites.fUnit.testTables.data.sortWeights.exte

11
--- NEW FILE: optx ---
FrontierVcsFile:1:long:suites.fUnit.testTables.data.sortWeights.optx

35
--- NEW FILE: dir20 ---
FrontierVcsFile:1:long:suites.fUnit.testTables.data.sortWeights.["dir "]

14
--- NEW FILE: alis ---
FrontierVcsFile:1:long:suites.fUnit.testTables.data.sortWeights.alis

27
--- NEW FILE: tokn ---
FrontierVcsFile:1:long:suites.fUnit.testTables.data.sortWeights.tokn

7

[frontierkernel-commits] odbs/frontierRoot/suites/fUnit/testTables/data/sortWeights - New directory

[Andre R. <and...@us...>]

Update of /cvsroot/frontierkernel/odbs/frontierRoot/suites/fUnit/testTables/data/sortWeights
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23750/sortWeights

Log Message:
Directory /cvsroot/frontierkernel/odbs/frontierRoot/suites/fUnit/testTables/data/sortWeights added to the repository

[frontierkernel-commits] odbs/frontierRoot/suites/fUnit/testTables/utils closeTestGDB,NONE,1.1, coerceTo,NONE,1.1, coerceTypes,NONE,1.1, compareNames,NONE,1.1, compareStrings,NONE,1.1, compareTypes,NONE,1.1, compareValues,NONE,1.1, getCoercionWeight,NONE,1.1, getLoopBoundaries,NONE,1.1, getRandomValue,NONE,1.1, getSortWeight,NONE,1.1, getTestGDB,NONE,1.1, insertForwardByName,NONE,1.1, insertRandom,NONE,1.1, insertReverseByName,NONE,1.1, isComparableType,NONE,1.1, isEqual,NONE,1.1, isExternalValue,NONE,1.1, isLessThan,NONE,1.1, min,NONE,1.1, openTestGDB,NONE,1.1, verifySortByKind,NONE,1.1, verifySortByName,NONE,1.1, verifySortByValue,NONE,1.1,

[Andre R. <and...@us...>]

Update of /cvsroot/frontierkernel/odbs/frontierRoot/suites/fUnit/testTables/utils
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17290/utils

Added Files:
	closeTestGDB coerceTo coerceTypes compareNames compareStrings 
	compareTypes compareValues getCoercionWeight getLoopBoundaries 
	getRandomValue getSortWeight getTestGDB insertForwardByName 
	insertRandom insertReverseByName isComparableType isEqual 
	isExternalValue isLessThan min openTestGDB verifySortByKind 
	verifySortByName verifySortByValue 
Log Message:
Add test suite for verifying various aspects of the table value type.

--- NEW FILE: isComparableType ---
FrontierVcsFile:1:scpt:suites.fUnit.testTables.utils.isComparableType

on isComparableType (t) {
	return ({'????', 'bool', 'char', 'shor', 'tokn', 'long', 'type', 'fixd', 'dir ', 'date', 'sing', 'exte','TEXT'} contains t)}
--- NEW FILE: getRandomValue ---
FrontierVcsFile:1:scpt:suites.fUnit.testTables.utils.getRandomValue

on getRandomValue (adr, flSimpleTypesOnly=false) {
	local (x);
	if flSimpleTypesOnly {
		x = random (1, 9)}
	else {
		x = random (1, 16)};
	case x {
		1 { //unknownType
			adr^ = nil};
		2 { //charType
			adr^ = char (random (0, 255))};
		3 { //shortType
			adr^ = short (((-1) + 2 * random (0, 1)) * random (0, 32767))};
		4 { //longType
			adr^ = number (((-1) + 2 * random (0, 1)) * random (0, infinity))};
		5 { //dateType
			adr^ = date (((-1) + 2 * random (0, 1)) * random (0, infinity))};
		6 { //booleanType
			adr^ = boolean (random (0, 1))};
		7 { //doubleType
			adr^ = ((-1) + 2 * random (0, 1)) * double (random (1, infinity)) / random (1, infinity)};
		8 { //string4Type
			adr = string4 (number (((-1) + 2 * random (0, 1)) * random (0, infinity)))};
		9 { //stringType 
			adr^ = string.getRandomPassword (random (1, 12))};
		10 { //listType
			local (theList = {}, val, i, len = random (1, 20));
			for i = 1 to len {
				parentOf (this^)^.getRandomValue (@val, flSimpleTypesOnly:true);
				theList[0] = val};
			adr^ = theList};
		11 { //recordType
			local (rec, val, i, len = random (1, 20));
			new (recordType, @rec);
			for i = 1 to len {
				parentOf (this^)^.getRandomValue (@val, flSimpleTypesOnly:true);
				rec[string.getRandomPassword (8)] = val};
			adr^ = rec};
		12 { //tableType
			new (tableType, adr)};
		13 { //scriptType
			new (scriptType, adr)};
		14 { //wptextType
			new (wptextType, adr)};
		15 { //outlineType
			new (outlineType, adr)};
		16 { //menubarType
			new (menubarType, adr)}};
	return}
--- NEW FILE: isExternalValue ---
FrontierVcsFile:1:scpt:suites.fUnit.testTables.utils.isExternalValue

on isExternalValue (t) {
	return ({'optx', 'wptx', 'tabl', 'scpt', 'mbar', 'pict', 'card'} contains t)}
--- NEW FILE: verifySortByName ---
FrontierVcsFile:1:scpt:suites.fUnit.testTables.utils.verifySortByName

on verifySortByName (adrtable, failmsg) {
	local (oldtarget = target.set (adrtable));
	assertEqual (table.getSortOrder (),  "Name", failmsg);
	try { target.set (oldtarget) };
	local (i);
	for i = 1 to sizeOf (adrtable^) - 1 {
		assertEqual (parentOf (this^)^.compareNames (adrtable, i, i+1), -1, failmsg)};
	return}
--- NEW FILE: min ---
FrontierVcsFile:1:scpt:suites.fUnit.testTables.utils.min

on min (a, b) {
	if a <= b {
		return a}
	else {
		return b}}
--- NEW FILE: getCoercionWeight ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: insertForwardByName ---
FrontierVcsFile:1:scpt:suites.fUnit.testTables.utils.insertForwardByName

on insertForwardByName (adrtable, ct) {
	local (i, low, high);
	parentOf (this^)^.getLoopBoundaries (ct, @low, @high);
	for ( i = low to high ) {
		local (val);
		parentOf (this^)^.getRandomValue (@val);
		adrtable^.[ "test_" + i ] = val};
	return}
--- NEW FILE: compareTypes ---
FrontierVcsFile:1:scpt:suites.fUnit.testTables.utils.compareTypes

on compareTypes (adrtable, ix1, ix2) {
	local (w1, w2);
	w1 = parentOf (this^)^.getSortWeight (typeOf (adrtable^[ix1]));
	w2 = parentOf (this^)^.getSortWeight (typeOf (adrtable^[ix2]));
	if w1 < w2 {
		return (-1)};
	if w1 > w2 {
		return (1)};
	return (parentOf (this^)^.compareNames (adrtable, ix1, ix2))}
--- NEW FILE: coerceTypes ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: compareStrings ---
FrontierVcsFile:1:scpt:suites.fUnit.testTables.utils.compareStrings

on compareStrings (s1, s2) {
	local (i, len, len1, len2);
	len1 = string.length (s1);
	len2 = string.length (s2);
	for i = 1 to fUnit.testTables.utils.min (len1, len2) {
		if s1[i] < s2[i] {
			return (-1)};
		if s1[i] > s2[i] {
			return (1)}};
	if len1 < len2 {
		return (-1)};
	if len1 > len2 {
		return (1)};
	return (0)}
--- NEW FILE: verifySortByKind ---
FrontierVcsFile:1:scpt:suites.fUnit.testTables.utils.verifySortByKind

on verifySortByKind (adrtable, failmsg) {
	local (oldtarget = target.set (adrtable));
	assertEqual (table.getSortOrder (),  "Kind", failmsg);
	try { target.set (oldtarget) };
	local (i);
	for i = 1 to sizeOf (adrtable^) - 1 {
		assertNotEqual (parentOf (this^)^.compareTypes (adrtable, i, i+1), 1, failmsg)};
	return}
--- NEW FILE: coerceTo ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: openTestGDB ---
FrontierVcsFile:1:scpt:suites.fUnit.testTables.utils.openTestGDB

on openTestGDB () {
	local (f = parentOf (this^)^.getTestGDB ());
	if not file.exists (f) {
		fileMenu.new (f, true)};
	if not defined ([f]) {
		fileMenu.open (f, true)};
	local (adrtop = @[f].[file.fileFromPath (f) - ".root"]);
	if not defined (adrtop^) {
		new (tableType, adrtop);
		try {delete (@[f].["item #1"])}};
	return (adrtop)}
--- NEW FILE: isLessThan ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: closeTestGDB ---
FrontierVcsFile:1:scpt:suites.fUnit.testTables.utils.closeTestGDB

on closeTestGDB () {
	local (f = parentOf (this^)^.getTestGDB ());
	if window.isOpen (f) {
		fileMenu.save (f);
		fileMenu.close (f)};
	return (f)}
--- NEW FILE: verifySortByValue ---
FrontierVcsFile:1:scpt:suites.fUnit.testTables.utils.verifySortByValue

on verifySortByValue (adrtable, failmsg) {
	local (oldtarget = target.set (adrtable));
	assertEqual (table.getSortOrder (),  "Value", failmsg);
	try { target.set (oldtarget) };
	local (i);
	for i = 1 to sizeOf (adrtable^) - 1 {
		assertNotEqual (parentOf (this^)^.compareValues (adrtable, i, i+1), 1, failmsg)};
	return}
--- NEW FILE: getTestGDB ---
FrontierVcsFile:1:scpt:suites.fUnit.testTables.utils.getTestGDB

on getTestGDB () {
	return (file.getSpecialFolderPath ("", "temp", true) + "fUnitTableTests.root")}
--- NEW FILE: getLoopBoundaries ---
FrontierVcsFile:1:scpt:suites.fUnit.testTables.utils.getLoopBoundaries

on getLoopBoundaries (ct, adrlower, adrupper) {
	local (i = ct, log10 = 0, pow10 = 1);
	while (i > 1) {
		i = i / 10;
		log10++};
	for i = 1 to log10 {
		pow10 = pow10 * 10};
	adrlower^ = pow10;
	adrupper^ = pow10 + ct - 1}
--- NEW FILE: insertRandom ---
FrontierVcsFile:1:scpt:suites.fUnit.testTables.utils.insertRandom

on insertRandom (adrtable, ct) {
	local (n = 0);
	while (n < ct) {
		name = string.getRandomPassword (5);
		if not defined (adrtable^.[name]) {
			local (val);
			parentOf (this^)^.getRandomValue (@val, true);
			adrtable^.[name] = val;
			n++}};
	return}
--- NEW FILE: compareNames ---
FrontierVcsFile:1:scpt:suites.fUnit.testTables.utils.compareNames

on compareNames (adrtable, ix1, ix2) {
	return (parentOf (this^)^.compareStrings (string.lower (nameOf (adrtable^[ix1])), string.lower (nameOf (adrtable^[ix2]))))}
--- NEW FILE: getSortWeight ---
FrontierVcsFile:1:scpt:suites.fUnit.testTables.utils.getSortWeight

on getSortWeight (t) {
	local (adr = @fUnit.testTables.data.sortWeights.[string (t)]);
	if defined (adr^) {
		return (adr^)}
	else {
		return (infinity)}}
--- NEW FILE: insertReverseByName ---
FrontierVcsFile:1:scpt:suites.fUnit.testTables.utils.insertReverseByName

on insertReverseByName (adrtable, ct) {
	local (i, low, high);
	parentOf (this^)^.getLoopBoundaries (ct, @low, @high);
	for ( i = high downTo low) {
		local (val);
		parentOf (this^)^.getRandomValue (@val);
		adrtable^.[ "test_" + i ] = val};
	return}
--- NEW FILE: isEqual ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: compareValues ---
FrontierVcsFile:1:scpt:suites.fUnit.testTables.utils.compareValues

on compareValues (adrtable, ix1, ix2) {
	local (val1, val2);
	val1 = adrtable^[ix1];
	val2 = adrtable^[ix2];
	if typeOf (val1) == typeOf (val2) {
		if parentOf (this^)^.isComparableType (typeOf (val1)) {
			try {
				if val1 < val2 {
					return (-1)}
				else {
					if val1 == val2 {
						return (0)}
					else {
						return (1)}}}}};
	return (parentOf (this^)^.compareTypes (adrtable, ix1, ix2))}

[frontierkernel-commits] odbs/frontierRoot/suites/fUnit/testTables name,NONE,1.1, description,NONE,1.1, testAssign,NONE,1.1, testRename,NONE,1.1, testSorting,NONE,1.1,

[Andre R. <and...@us...>]

Update of /cvsroot/frontierkernel/odbs/frontierRoot/suites/fUnit/testTables
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17192

Added Files:
	name description testAssign testRename testSorting 
Log Message:
Add test suite for verifying various aspects of the table value type.

--- NEW FILE: testRename ---
FrontierVcsFile:1:scpt:suites.fUnit.testTables.testRename

on testRename () {
	
	on test (adrtable, ct) {
		new (tableType, adrtable);
		parentOf (this^)^.utils.insertRandom (adrtable, ct);
		assertEqual (sizeOf (adrtable^),  ct, "Insertion (random) is broken, incorrect number of items inserted");
		parentOf (this^)^.utils.verifySortByName (adrtable, "Insertion (random by name) is broken");
		for i = 1 to ct {
			name = string.getRandomPassword (5);
			if not defined (adrtable^.[name]) {
				table.rename (@adrtable^[random (1, ct)], name);
				assert (defined (adrtable^.[name]))}};
		assertEqual (sizeOf (adrtable^),  ct, "Renaming is broken, incorrect number of items after renaming");
		parentOf (this^)^.utils.verifySortByName (adrtable, "Renaming is broken")};
	
	test (@t, random (2, 199)); //test local table
	
	test (fUnit.getTempTableAdr (), random (2, 199)); //test temp table
	
	test (@scratchpad.fUnitTableTest, random (2, 199)); //test scratchpad table
	
	bundle { //test GDB table
		local (adrtop);
		adrtop = parentOf (this^)^.utils.openTestGDB ();
		test (@adrtop^.renaming, random (2, 199));
		parentOf (this^)^.utils.closeTestGDB ()};
	};

bundle { //debug code
	fUnit.runners.run (parentOf(this^), testCaseToRun: this)}
--- NEW FILE: testSorting ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: testAssign ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: name ---
FrontierVcsFile:1:TEXT:suites.fUnit.testTables.name

Tables
--- NEW FILE: description ---
FrontierVcsFile:1:wptx:suites.fUnit.testTables.description

Suite for testing various aspects of tables, started by Andre Radke.

[frontierkernel-commits] odbs/frontierRoot/suites/fUnit/testTables/data - New directory

[Andre R. <and...@us...>]

Update of /cvsroot/frontierkernel/odbs/frontierRoot/suites/fUnit/testTables/data
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14465/data

Log Message:
Directory /cvsroot/frontierkernel/odbs/frontierRoot/suites/fUnit/testTables/data added to the repository

[frontierkernel-commits] odbs/frontierRoot/suites/fUnit/testTables/utils - New directory

[Andre R. <and...@us...>]

Update of /cvsroot/frontierkernel/odbs/frontierRoot/suites/fUnit/testTables/utils
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14465/utils

Log Message:
Directory /cvsroot/frontierkernel/odbs/frontierRoot/suites/fUnit/testTables/utils added to the repository

[frontierkernel-commits] odbs/frontierRoot/suites/fUnit/testTables - New directory

[Andre R. <and...@us...>]

Update of /cvsroot/frontierkernel/odbs/frontierRoot/suites/fUnit/testTables
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14396/testTables

Log Message:
Directory /cvsroot/frontierkernel/odbs/frontierRoot/suites/fUnit/testTables added to the repository

[frontierkernel-commits] Frontier/Common/source shellmenu.c,1.14,1.15,

[Andre R. <and...@us...>]

Update of /cvsroot/frontierkernel/Frontier/Common/source
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv669/Common/source

Modified Files:
	shellmenu.c 
Log Message:
Enable Open Recent menu in Frontier for Mac OS Classic.

Index: shellmenu.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/shellmenu.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** shellmenu.c	15 Feb 2006 00:17:51 -0000	1.14
--- shellmenu.c	19 Feb 2006 17:06:38 -0000	1.15
***************
*** 1452,1455 ****
--- 1452,1459 ----
  void shellupdatemenus (void) {
  	
+ 	/*
+ 	2006-02-19 aradke: enable open recent menu on classic Mac OS too
+ 	*/
+ 	
  	tymenustate newstate;
  	
***************
*** 1476,1484 ****
  	
  #ifndef PIKE
- #	if TARGET_API_MAC_OS8 == 0
- 	// kw - 2006-02-15 --- due to osx specific implementation, classic isn't
- 	// allowed to reference shellupdateopenrecentmenu()
  	shellupdateopenrecentmenu ();	/* 2006-02-11 aradke */
- #	endif
  #endif
  	} /*shellupdatemenus*/
--- 1480,1484 ----

[frontierkernel-commits] Frontier/Common/source menu.c,1.6,1.7,

[Andre R. <and...@us...>]

Update of /cvsroot/frontierkernel/Frontier/Common/source
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21956/Common/source

Modified Files:
	menu.c 
Log Message:
Switch to platform-agnostic code in deletemenuitems and disableallmenuitems.

Index: menu.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/menu.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** menu.c	20 Dec 2005 22:30:35 -0000	1.6
--- menu.c	19 Feb 2006 16:43:30 -0000	1.7
***************
*** 1675,1702 ****
  	/*
  	2005-10-01 creedon: created, delete menu items starting at firstitem for itemcount
  	*/
  
! 	boolean fl = true;
! 
! #ifdef MACVERSION
! 	fl = DeleteMenuItems (hmenu, firstitem, itemcount) == noErr;
! #endif
! 
! 	#ifdef WIN95VERSION
! 		register short ctitems = countmenuitems (hmenu);
! 		register short i;
! 		
! 		if (itemcount > ctitems)
! 			itemcount = ctitems;
! 		
! 		for (i = itemcount; i >= firstitem; i--)
! 			if (!deletemenuitem (hmenu, i)) {
! 				fl = false;
! 				break;
! 				}			
! 	#endif
  	
! 	return (fl);
  	
  	} /* deletemenuitems */
  
--- 1675,1695 ----
  	/*
  	2005-10-01 creedon: created, delete menu items starting at firstitem for itemcount
+ 	
+ 	2006-02-19 aradke: switched to platform-agnostic code
  	*/
  
! 	short ctitems = countmenuitems (hmenu);
! 	short i;
  	
! 	if (itemcount > ctitems)
! 		itemcount = ctitems;
  	
+ 	for (i = itemcount; i >= firstitem; i--) {
+ 		if (!deletemenuitem (hmenu, i)) {
+ 			return (false);
+ 			}			
+ 		} /*for*/
+ 		
+ 	return (true);
  	} /* deletemenuitems */
  
***************
*** 1706,1723 ****
  	/*
  	2005-10-01 creedon: created
  	*/
  
! #ifdef MACVERSION
! 	DisableAllMenuItems (hmenu);
! #endif
! 
! #ifdef WIN95VERSION
! 	register short ct = countmenuitems (hmenu);
! 	register short i;
  
  	for (i = ct; i > 0; i--)
  		disablemenuitem (hmenu, i);
- 
- #endif
  	
  	} /* disableallmenuitems */
--- 1699,1711 ----
  	/*
  	2005-10-01 creedon: created
+ 	
+ 	2006-02-19 aradke: switched to platform-agnostic code
  	*/
  
! 	short ct = countmenuitems (hmenu);
! 	short i;
  
  	for (i = ct; i > 0; i--)
  		disablemenuitem (hmenu, i);
  	
  	} /* disableallmenuitems */

[frontierkernel-commits] odbs/frontierRoot/workspace .DS_Store,1.1.1.1,NONE,

[creedon <icr...@us...>]

Update of /cvsroot/frontierkernel/odbs/frontierRoot/workspace
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15593

Removed Files:
	.DS_Store 
Log Message:
removed

--- .DS_Store DELETED ---

[frontierkernel-commits] odbs/frontierRoot/system/verbs/builtins/rootUpdates getPendingUpdatesList,1.2,1.3,

[creedon <icr...@us...>]

Update of /cvsroot/frontierkernel/odbs/frontierRoot/system/verbs/builtins/rootUpdates
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2501

Modified Files:
	getPendingUpdatesList 
Log Message:
fixed problem with trying to check the category of an item that had already been deleted

Index: getPendingUpdatesList
===================================================================
RCS file: /cvsroot/frontierkernel/odbs/frontierRoot/system/verbs/builtins/rootUpdates/getPendingUpdatesList,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** getPendingUpdatesList	31 Jan 2006 20:14:24 -0000	1.2
--- getPendingUpdatesList	19 Feb 2006 02:53:41 -0000	1.3
***************
*** 1,3 ****
  FrontierVcsFile:1:scpt:system.verbs.builtins.rootUpdates.getPendingUpdatesList
  
! on getPendingUpdatesList (adrUpdatesTable, rssUrl, databasesToUpdate, categories = nil) {
	ÇChanges
		Ç1/28/06; 7:21:26 PM by TAC
			Çadded categories parameter
			Çreplaced referrer url with baseUrl and ip information
		Ç8/5/04; 11:09:35 PM by JES
			ÇChange initial whenLastUpdatesRead date to 8/4/04.
		Ç12/17/03; 1:34:37 AM by JES
			ÇCreated. Read the RSS fead that lists pending root updates.
	
	local (flRead = false);
	
	if not defined (adrUpdatesTable^) {
		new (tableType, adrUpdatesTable)};
	
	if not defined (adrUpdatesTable^.pendingUpdates) {
		new (tableType, @adrUpdatesTable^.pendingUpdates)};
	
	if not defined (adrUpdatesTable^.whenLastUpdatesRead) {
		adrUpdatesTable^.whenLastUpdatesRead = date.set (4, 8, 2004, 0, 0, 0)};
	
	if adrUpdatesTable^.whenLastUpdatesRead < date.yesterday (clock.now ()) { //read up to once every 24 hours
		flRead = true};
	
	if flRead { //read the feature list RSS feed, and populate the pendingUpdates table
		adrUpdatesTable^.whenLastUpdatesRead = clock.now ();
		
		bundle { //read the updates into the pendingUpdates table
			local (services); new (tableType, @services); //a spoofed temporary services table
			
			new (tableType, @services.[rssUrl]);
			
			on storyArrivedCallback (adrservice, adrstory) {
				adrUpdatesTable^.pendingUpdates.[nameOf (adrstory^)] = adrstory^};
			
			new (tableType, @adrUpdatesTable^.pendingUpdates);
			
			bundle { //read the RSS feed using xml.rss.readService
				xml.rss.readService (rssUrl, @services, config.mainresponder.prefs.baseUrl + "?ip=" + tcp.myDottedID (), @storyArrivedCallback, true)}}};
	
	bundle { //delete any updates that we already have
		local (db, lastUpdate);
		
		for db in databasesToUpdate { //get lowest update date -- lowest common denominator
			try {
				local (adrprefs = @user.rootUpdates.servers.[db]);
				
				if typeOf (lastUpdate) == unknownType {
					lastUpdate = date (adrprefs^.lastUpdate)}
				else {
					if date (adrprefs^.lastUpdate) < lastUpdate {
						lastUpdate = date (adrprefs^.lastUpdate)}}}};
		
		local (ctUpdates = sizeOf (adrUpdatesTable^.pendingUpdates), i);
		
		for i = ctUpdates downto 1 { //delete updates before lastUpdate or that don't match categories
			local (adr = @adrUpdatesTable^.pendingUpdates [i]);
			
			if date (adr^.data.pubDate) < lastUpdate {
				delete (adr)};
			
			if typeOf (categories) == listType {
				local (fl = true, item);
				
				for item in categories {
					if adr^.catlist contains item {
						fl = false;
						
						break}};
				
				if fl {
					delete (adr)}}}};
	
	return (sizeOf (adrUpdatesTable^.pendingUpdates))}
\ No newline at end of file
--- 1,3 ----
  FrontierVcsFile:1:scpt:system.verbs.builtins.rootUpdates.getPendingUpdatesList
  
! on getPendingUpdatesList (adrUpdatesTable, rssUrl, databasesToUpdate, categories = nil) {
	ÇChanges
		Ç2/18/06; 6:03:07 PM by TAC
			Çfixed problem with trying to check the category of an item that had already been deleted
		Ç1/28/06; 7:21:26 PM by TAC
			Çadded categories parameter
			Çreplaced referrer url with baseUrl and ip information
		Ç8/5/04; 11:09:35 PM by JES
			ÇChange initial whenLastUpdatesRead date to 8/4/04.
		Ç12/17/03; 1:34:37 AM by JES
			ÇCreated. Read the RSS fead that lists pending root updates.
	
	local (flRead = false);
	
	if not defined (adrUpdatesTable^) {
		new (tableType, adrUpdatesTable)};
	
	if not defined (adrUpdatesTable^.pendingUpdates) {
		new (tableType, @adrUpdatesTable^.pendingUpdates)};
	
	if not defined (adrUpdatesTable^.whenLastUpdatesRead) {
		adrUpdatesTable^.whenLastUpdatesRead = date.set (4, 8, 2004, 0, 0, 0)};
	
	if adrUpdatesTable^.whenLastUpdatesRead < date.yesterday (clock.now ()) { //read up to once every 24 hours
		flRead = true};
	
	if flRead { //read the feature list RSS feed, and populate the pendingUpdates table
		adrUpdatesTable^.whenLastUpdatesRead = clock.now ();
		
		bundle { //read the updates into the pendingUpdates table
			local (services); new (tableType, @services); //a spoofed temporary services table
			
			new (tableType, @services.[rssUrl]);
			
			on storyArrivedCallback (adrservice, adrstory) {
				adrUpdatesTable^.pendingUpdates.[nameOf (adrstory^)] = adrstory^};
			
			new (tableType, @adrUpdatesTable^.pendingUpdates);
			
			bundle { //read the RSS feed using xml.rss.readService
				xml.rss.readService (rssUrl, @services, config.mainresponder.prefs.baseUrl + "?ip=" + tcp.myDottedID (), @storyArrivedCallback, true)}}};
	
	bundle { //delete any updates that we already have
		local (db, lastUpdate);
		
		for db in databasesToUpdate { //get lowest update date -- lowest common denominator
			try {
				local (adrprefs = @user.rootUpdates.servers.[db]);
				
				if typeOf (lastUpdate) == unknownType {
					lastUpdate = date (adrprefs^.lastUpdate)}
				else {
					if date (adrprefs^.lastUpdate) < lastUpdate {
						lastUpdate = date (adrprefs^.lastUpdate)}}}};
		
		local (ctUpdates = sizeOf (adrUpdatesTable^.pendingUpdates), i, flDelete);
		
		for i = ctUpdates downto 1 { //delete updates before lastUpdate or that don't match categories
			local (adr = @adrUpdatesTable^.pendingUpdates [i]);
			
			if date (adr^.data.pubDate) < lastUpdate {
				delete (adr);
				continue};
			
			if typeOf (categories) == listType {
				local (fl = true, item);
				
				for item in categories {
					if adr^.catlist contains item {
						fl = false;
						
						break}};
				
				if fl {
					delete (adr)}}}};
	
	return (sizeOf (adrUpdatesTable^.pendingUpdates))}
\ No newline at end of file

[frontierkernel-commits] odbs/mainResponderRoot/mainResponder/adminSite/website maintenance,1.2,1.3,

[creedon <icr...@us...>]

Update of /cvsroot/frontierkernel/odbs/mainResponderRoot/mainResponder/adminSite/website
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1347

Modified Files:
	maintenance 
Log Message:
disabled index now, specific to Manila

more de-Manilaization

towards XHTML compliance

minor script format tweaks

remove UserLand

Index: maintenance
===================================================================
RCS file: /cvsroot/frontierkernel/odbs/mainResponderRoot/mainResponder/adminSite/website/maintenance,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** maintenance	16 Jun 2005 22:31:12 -0000	1.2
--- maintenance	19 Feb 2006 02:50:25 -0000	1.3
***************
*** 1,3 ****
  FrontierVcsFile:1:scpt:mainResponder.adminSite.website.maintenance
  
! on maintenance () {
	ÇChanges
		Ç6/16/05; 2:53:00 PM by TAC
			Çde-Manilaize
		Ç9/8/02; 4:46:12 PM by JES
			ÇFixed a typo. Implemented the Reset search enging index function, with a confirmation page.
		Ç8/18/02; 10:08:53 PM by JES
			ÇCreated. Render a page of server maintenance functions.
	local (pta = html.getPageTableAddress ());
	pta^.title = "Maintenance";
	
	local (htmltext);
	on add (s) {
		htmltext = htmltext + (s + "\r");};
	
	local (backupConfirmText = "", searchConfirmText = "");
	if pta^.method == "POST" {
		local (adrargs = @pta^.postArgs);
		case true { //figure out which button the user clicked
			Çdefined (adrargs^.backupNow) // 6/16/05; 2:52:33 PM by TAC - disabled, Manila specific code, eventually remove?
				Çthread.callScript (@manilaSuite.backups.backupAllSites, {})
				Çlocal (notificationlist = config.manila.backups.notifyList)
				Çif typeOf (notificationlist) == listType
					Çnotificationlist = ""
					Çlocal (oneaddr)
					Çfor oneaddr in config.manila.backups.notifyList
						Çnotificationlist = notificationlist + oneaddr + ", "
					Çnotificationlist = string.delete (notificationlist, sizeOf (notificationlist) - 1, 2)
				ÇbackupConfirmText = "Manila site backups have been started. When the backups are complete, an email notification will be sent to " + notificationlist + " when the backup operation is complete."
			defined (adrargs^.indexNow) {
				local (adr);
				for adr in @config.manila.sites {
					local (adrsite = adr^);
					try {adrsite^.["#newsSite"].search.indexQueue.flRunning = true}};
				searchConfirmText = "All Manila sites on this server have been scheduled to be re-indexed by the Search Engine Server."};
			defined (adrargs^.resetIndex) {
				add ("<form method=\"POST\">");
				add ("<p>Are you sure you want to completely reset the entire search engine index?</p><p>This operation cannot be undone.</p>");
				add ("<p><br /><input type=\"submit\" name=\"cancel\" value=\"Cancel\" />&nbsp;&nbsp;&nbsp;<input type=\"submit\" name=\"resetIndexConfirm\" value=\"Reset Index\" /></p>");
				add ("</form>");
				return (htmltext)};
			defined (adrargs^.resetIndexConfirm) {
				mainResponder.search.utilities.assureIndex ();
				local (indexpath = mainResponder.search.utilities.getIndexPath ());
				local (adrindex = @[indexpath].index);
				local (adrpageinfo = @[indexpath].pageInfo);
				new (tableType, adrindex);
				new (tableType, adrpageinfo);
				fileMenu.saveMyRoot (adrindex);
				searchConfirmText = "The search engine index has been completely reset. Sites for which indexing is enabled will have new or changed pages indexed."}}};
	
	bundle { //explanatory text
		add ("<p>This page provides access to server-wide maintenance functions like Backups, Search Engine Indexing options.</p>")};
	
	bundle { //database update options
		add ("<h4><a name=\"updates\"></a>Updates</h4>");
		add ("<form method=\"POST\">");
		bundle { //explanatory text
			add ("<p>Frontier can automatically connect to a server at UserLand, to get new features and bug fixes. Only those parts that have changed since the last update will be installed. To update your databases now, click the Update Now button.</p>")};
		add (mainResponder.adminSite.prefs.updateNowButton (false));
		add ("</form>")};
	
	Ç6/16/05; 2:52:33 PM by TAC - disabled, Manila specific code, eventually remove?
		Çadd ("<br /><hr size=\"1\">")
		Çbundle //backup options
			Çadd ("<h4><a name=\"manilaBackups\"></a>Backup Manila Sites</h4>")
			Çadd ("<form method=\"POST\">")
			Çbundle //explanatory text
				Çadd ("<p>To make an immediate backup of all sites which have automatic backups enabled, click the Backup Now button.</p>")
			Çbundle //Backup Now and Backup All Sites buttons
				Çadd ("<p><br /><input type=\"submit\" name=\"backupNow\" value=\"Backup Now\" /></p>")
			Çif backupConfirmText == ""
				Çadd ("<p><br />You can enable backups for any site by clicking the site's name on the <a href=\"" + mainResponder.adminSite.urls.home + "\">home page</a>, and then clicking the enable link, in the Backups section.</p>")
			Çelse
				Çadd ("<br /><b>" + backupConfirmText + "</b></p>")
			Çadd ("</form>")
	
	add ("<br /><hr size=\"1\">");
	bundle { //search engine indexing options
		add ("<h4><a name=\"searchEngine\"></a>Search Engine</h4>");
		if config.mainResponder.prefs.flSearchEngine {
			add ("<form method=\"POST\">");
			bundle { //explanatory text
				add ("<p>To re-index all Manila sites for which Search Engine Indexing is enabled, click the Index Now button. To clear the Search Engine index completely, click the Reset Index button.</p>")};
			bundle { //Index Now and Reset Index buttons
				add ("<p><br /><input type=\"submit\" name=\"indexNow\" value=\"Index Now\" />&nbsp;&nbsp;&nbsp;<input type=\"submit\" name=\"resetIndex\" value=\"Reset Index\" /></p>")};
			add ("</form>");
			if searchConfirmText != "" {
				add ("<b><br /><b>" + searchConfirmText + "</b></p>")}}
		else { //disabled -- let the admin know
			add ("<p>Search Engine Indexing options are unavailable because the Search Engine is currently disabled. To turn on the Search Engine, use the Search Engine settings page.</p>")}};
	
	return (htmltext)}
\ No newline at end of file
--- 1,3 ----
  FrontierVcsFile:1:scpt:mainResponder.adminSite.website.maintenance
  
! on maintenance () {
	ÇChanges
		Ç2/18/06; 6:18:02 PM by TAC
			Çdisabled index now, specific to Manila
			Çmore de-Manilaization
			Çtowards XHTML compliance
			Çminor script format tweaks
			Çremove UserLand
		Ç6/16/05; 2:53:00 PM by TAC
			Çde-Manilaize
		Ç9/8/02; 4:46:12 PM by JES
			ÇFixed a typo. Implemented the Reset search enging index function, with a confirmation page.
		Ç8/18/02; 10:08:53 PM by JES
			ÇCreated. Render a page of server maintenance functions.
	
	local (pta = html.getPageTableAddress ());
	
	pta^.title = "Maintenance";
	
	local (htmlText);
	
	on add (s) {
		htmlText = htmlText + (s + "\r");};
	
	local (backupConfirmText = "", searchConfirmText = "");
	
	if string.lower (pta^.method) == "post" {
		local (adrArgs = @pta^.postArgs);
		
		case true { //figure out which button the user clicked
			Çdefined (adrArgs^.backupNow) // 6/16/05; 2:52:33 PM by TAC - disabled, Manila specific code, eventually remove?
				Çthread.callScript (@manilaSuite.backups.backupAllSites, {})
				Çlocal (notificationlist = config.manila.backups.notifyList)
				Çif typeOf (notificationlist) == listType
					Çnotificationlist = ""
					Çlocal (oneaddr)
					Çfor oneaddr in config.manila.backups.notifyList
						Çnotificationlist = notificationlist + oneaddr + ", "
					Çnotificationlist = string.delete (notificationlist, sizeOf (notificationlist) - 1, 2)
				ÇbackupConfirmText = "Manila site backups have been started. When the backups are complete, an email notification will be sent to " + notificationlist + " when the backup operation is complete."
			Çdefined (adrArgs^.indexNow)
				Çlocal (adr)
				Ç
				Çfor adr in @config.manila.sites
					Çlocal (adrsite = adr^)
					Ç
					Çtry {adrsite^.["#newsSite"].search.indexQueue.flRunning = true}
				Ç
				ÇsearchConfirmText = "All sites on this server have been scheduled to be re-indexed by the Search Engine Server."
			defined (adrArgs^.resetIndex) {
				add ("<form method=\"post\">");
				add ("<p>Are you sure you want to completely reset the entire search engine index?</p><p>This operation cannot be undone.</p>");
				add ("<p><br /><input type=\"submit\" name=\"cancel\" value=\"Cancel\" />&nbsp;&nbsp;&nbsp;<input type=\"submit\" name=\"resetIndexConfirm\" value=\"Reset Index\" /></p>");
				add ("</form>");
				
				return (htmlText)};
			defined (adrArgs^.resetIndexConfirm) {
				mainResponder.search.utilities.assureIndex ();
				
				local (indexPath = mainResponder.search.utilities.getindexPath ());
				local (adrIndex = @[indexPath].index);
				local (adrPageInfo = @[indexPath].pageInfo);
				
				new (tableType, adrIndex);
				new (tableType, adrPageInfo);
				
				fileMenu.saveMyRoot (adrIndex);
				
				searchConfirmText = "The search engine index has been completely reset. Sites for which indexing is enabled will have new or changed pages indexed."}}};
	
	bundle { //explanatory text
		add ("<p>This page provides access to server-wide maintenance functions like Updates and Search Engine Indexing options.</p>")};
		ÇBackups, 
	
	bundle { //database update options
		add ("<h4><a name=\"updates\"></a>Updates</h4>");
		add ("<form method=\"post\">");
		
		bundle { //explanatory text
			add ("<p>" + Frontier.getProgramName (false) + " can automatically connect to a server, to get new features and bug fixes. Only those parts that have changed since the last update will be installed. To update your databases now, click the Update Now button.</p>")};
		
		add (mainResponder.adminSite.prefs.updateNowButton (false));
		add ("</form>")};
	
	Ç6/16/05; 2:52:33 PM by TAC - disabled, Manila specific code, eventually remove?
		Çadd ("<br /><hr size=\"1\">")
		Çbundle //backup options
			Çadd ("<h4><a name=\"manilaBackups\"></a>Backup Manila Sites</h4>")
			Çadd ("<form method=\"post\">")
			Çbundle //explanatory text
				Çadd ("<p>To make an immediate backup of all sites which have automatic backups enabled, click the Backup Now button.</p>")
			Çbundle //Backup Now and Backup All Sites buttons
				Çadd ("<p><br /><input type=\"submit\" name=\"backupNow\" value=\"Backup Now\" /></p>")
			Çif backupConfirmText == ""
				Çadd ("<p><br />You can enable backups for any site by clicking the site's name on the <a href=\"" + mainResponder.adminSite.urls.home + "\">home page</a>, and then clicking the enable link, in the Backups section.</p>")
			Çelse
				Çadd ("<br /><b>" + backupConfirmText + "</b></p>")
			Çadd ("</form>")
	
	add ("<br /><hr size=\"1\">");
	
	bundle { //search engine indexing options
		add ("<h4><a name=\"searchEngine\"></a>Search Engine</h4>");
		
		if config.mainResponder.prefs.flSearchEngine {
			add ("<form method=\"post\">");
			
			bundle { //explanatory text
				add ("<p>");
				Çadd ("To re-index all sites for which Search Engine Indexing is enabled, click the Index Now button. ")
				add ("To clear the Search Engine index completely, click the Reset Index button.");
				add ("</p>")};
			
			bundle { //Index Now and Reset Index buttons
				add ("<p><br />");
				Çadd ("<input type=\"submit\" name=\"indexNow\" value=\"Index Now\" />")
				Çadd ("&nbsp;&nbsp;&nbsp;")
				add ("<input type=\"submit\" name=\"resetIndex\" value=\"Reset Index\" />");
				add ("</p>")};
			
			add ("</form>");
			
			if searchConfirmText != "" {
				add ("<b><br /><b>" + searchConfirmText + "</b></p>")}}
		else { //disabled -- let the admin know
			add ("<p>Search Engine Indexing options are unavailable because the Search Engine is currently disabled. To turn on the Search Engine, use the Search Engine settings page.</p>")}};
	
	return (htmlText)}
\ No newline at end of file

[frontierkernel-commits] odbs/frontierRoot/suites/fUnit/testfUnit/testTeardown name,1.1,1.2, setup,1.1,1.2, teardown,1.1,1.2, testToRun,1.1,1.2,

[Andre R. <and...@us...>]

Update of /cvsroot/frontierkernel/odbs/frontierRoot/suites/fUnit/testfUnit/testTeardown
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27969/testfUnit/testTeardown

Added Files:
	name setup teardown testToRun 
Log Message:
Merge changes from fUnit_Suite-branch.

--- NEW FILE: teardown ---
FrontierVcsFile:1:scpt:suites.fUnit.testfUnit.testTeardown.teardown

on teardown (setupParm) {
	if setupParm^.value != 2 {
		scriptError ("teardown isn't working, or is not receiving parameters correctly.")}}
--- NEW FILE: setup ---
FrontierVcsFile:1:scpt:suites.fUnit.testfUnit.testTeardown.setup

on setup () {
	local (tblAdr = fUnit.getTempTableAdr());
	tblAdr^.value = 1;
	return tblAdr}
--- NEW FILE: name ---
FrontierVcsFile:1:TEXT:suites.fUnit.testfUnit.testTeardown.name

Test tear down
--- NEW FILE: testToRun ---
FrontierVcsFile:1:scpt:suites.fUnit.testfUnit.testTeardown.testToRun

on testToRun (setupParm) {
	setupParm^.value = setupParm^.value + 1;
	assertEqual(setupParm^.value, 2, "setup can't pass table addresses correctly")}

[frontierkernel-commits] odbs/frontierRoot/suites/fUnit/testfUnit2 README,1.1,1.2,

[Andre R. <and...@us...>]

Update of /cvsroot/frontierkernel/odbs/frontierRoot/suites/fUnit/testfUnit2
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27969/testfUnit2

Added Files:
	README 
Log Message:
Merge changes from fUnit_Suite-branch.

--- NEW FILE: README ---
FrontierVcsFile:1:optx:suites.fUnit.testfUnit2.README

These are suites that are intended to fail, to test the failure states of the fUnit framework. As such, they are not meant to be run directly, but in the context of testfUnit.testfUnitFailures. Do not add these to the global testing suite.

[frontierkernel-commits] odbs/frontierRoot/suites/fUnit/testfUnit2/testSetupFailure setup,1.1,1.2, testDummy,1.1,1.2,

[Andre R. <and...@us...>]

Update of /cvsroot/frontierkernel/odbs/frontierRoot/suites/fUnit/testfUnit2/testSetupFailure
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27969/testfUnit2/testSetupFailure

Added Files:
	setup testDummy 
Log Message:
Merge changes from fUnit_Suite-branch.

--- NEW FILE: testDummy ---
FrontierVcsFile:1:scpt:suites.fUnit.testfUnit2.testSetupFailure.testDummy

on testDummy (setupParm = nil) {
	1 == 1} // dummy test so setup runs
--- NEW FILE: setup ---
FrontierVcsFile:1:scpt:suites.fUnit.testfUnit2.testSetupFailure.setup

on setup () {
	scriptError ("Setup failed.")}