gnue gnue-common/MANIFEST.in gnue-common/gnue/c...

[James Thompson]

CVSROOT:        /cvs
Module name:    gnue
Changes by:             01/04/16 16:23:13

Modified files:
        gnue-common    : MANIFEST.in 
        gnue-common/gnue/common: GParser.py 
        gnuef/client   : gfclient 
        gnuef/src      : GFTrigger.py 

Log message:
        Fixed status bar not updating status after query with no records 
returned
        Additional changes needed to make multi-line triggers work

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/MANIFEST.in.diff?cvsroot=OldCVS&tr1=1.1&tr2=1.2&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/gnue/common/GParser.py.diff?cvsroot=OldCVS&tr1=1.2&tr2=1.3&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/client/gfclient.diff?cvsroot=OldCVS&tr1=1.33&tr2=1.34&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnuef/src/GFTrigger.py.diff?cvsroot=OldCVS&tr1=1.18&tr2=1.19&r1=text&r2=text

Patches:
Index: gnue/gnue-common/MANIFEST.in
diff -u gnue/gnue-common/MANIFEST.in:1.1 gnue/gnue-common/MANIFEST.in:1.2
--- gnue/gnue-common/MANIFEST.in:1.1    Sun Apr 15 20:33:43 2001
+++ gnue/gnue-common/MANIFEST.in        Mon Apr 16 16:23:13 2001
@@ -8,3 +8,4 @@
 include TODO
 
 include images/*.png
+include setupext/*.py
Index: gnue/gnue-common/gnue/common/GParser.py
diff -u gnue/gnue-common/gnue/common/GParser.py:1.2 
gnue/gnue-common/gnue/common/GParser.py:1.3
--- gnue/gnue-common/gnue/common/GParser.py:1.2 Mon Apr 16 16:08:23 2001
+++ gnue/gnue-common/gnue/common/GParser.py     Mon Apr 16 16:23:13 2001
@@ -211,19 +211,19 @@
   def characters(self, ch, start, length):
 
     text = ch[start:start+length]
-    print "####" + text + "####"
+    # print "####" + text + "####"
     if self.xmlStack[0] != None:
       if len(string.replace(string.replace(string.replace(text,' 
',''),'\n',''),'\t','')):
         # Should we normalize the text: 
         if self.xmlElements[self.nameStack[0]][2]: 
-          print "Normalizing..."
+          #print "Normalizing..."
           text = normalise_whitespace (text)
           if len(text): 
             GContent(self.xmlStack[0], text)
         else: 
           print "Not normalizing"
           GContent(self.xmlStack[0], text)
-        print ">>>%s" % text
+        #print ">>>%s" % text
 
     
   def endElement(self, name):
Index: gnue/gnuef/client/gfclient
diff -u gnue/gnuef/client/gfclient:1.33 gnue/gnuef/client/gfclient:1.34
--- gnue/gnuef/client/gfclient:1.33     Mon Apr 16 13:20:54 2001
+++ gnue/gnuef/client/gfclient  Mon Apr 16 16:23:13 2001
@@ -16,7 +16,7 @@
 #
 # Copyright (c) 2000 Free Software Foundation
 #
-# $Id: gfclient,v 1.33 2001/04/16 20:20:54 jamest Exp $
+# $Id: gfclient,v 1.34 2001/04/16 23:23:13 jamest Exp $
 #
 
 import pstats
@@ -406,6 +406,8 @@
     if message:
       messageBox = GFMsgBox(self,message)
       messageBox.show()
+    self.updateRecordStatus()
+    self.updateRecordCounter()
                                         
   def replaceValue(self,event):
     replacement = ""
Index: gnue/gnuef/src/GFTrigger.py
diff -u gnue/gnuef/src/GFTrigger.py:1.18 gnue/gnuef/src/GFTrigger.py:1.19
--- gnue/gnuef/src/GFTrigger.py:1.18    Fri Apr 13 05:59:58 2001
+++ gnue/gnuef/src/GFTrigger.py Mon Apr 16 16:23:13 2001
@@ -107,7 +107,7 @@
 
     self.__call__ = self.dummyFunction
 
-    print self.event
+    #print self.event
 
     if self.event!="NAMED":
       if self.parent:
@@ -131,6 +131,7 @@
       print "Language %s not implemented" % self.language
       sys.exit()
     # Remove whitespace from last line
+    print "#>#> %s <#<#" % self.text
     self.text = string.rstrip(self.text)
     # First compile the trigger:
     #   Compilation at this stage has the useful side effect that
@@ -140,6 +141,7 @@
     try:
       self.code = compile(revisedTriggerCode, '<string>', 'exec')
     except SyntaxError, err:
+      print revisedTriggerCode
       print "Syntax error in line %d of trigger in element ??" \
             % ( err.lineno )
       sys.exit()
@@ -159,6 +161,9 @@
       
   def dummyFunction(self, myself):
     print "Trigger not implemented"
+
+  def getChildrenAsContent(self):
+    return GObj.getChildrenAsContent(self, "\n")
   
 #
 # Helper class for building the namespace for python triggers. All access