--- nfo/projects/netfraggle/bin/fraggleEngine.py	2004/08/31 02:23:07	1.6
+++ nfo/projects/netfraggle/bin/fraggleEngine.py	2004/09/17 09:42:30	1.12
@@ -5,13 +5,33 @@
 # Author:      joko
 #
 # Created:     2004/30/08
-# RCS-ID:      $Id: fraggleEngine.py,v 1.6 2004/08/31 02:23:07 joko Exp $
+# RCS-ID:      $Id: fraggleEngine.py,v 1.12 2004/09/17 09:42:30 xabbu Exp $
 # Copyright:   (c) 2004 netfrag.org
 # Licence:     GPL
 #-----------------------------------------------------------------------------
 
 #-----------------------------------------------------------------------------
 # $Log: fraggleEngine.py,v $
+# Revision 1.12  2004/09/17 09:42:30  xabbu
+# U function listItems() places a query to the server now and returns its results
+#
+# Revision 1.11  2004/09/15 22:27:06  xabbu
+# +/- function fraggleSync replaced by function syncTopics which places a query
+# + function query has simple eval of error return code now
+#
+# Revision 1.10  2004/09/13 21:07:38  xabbu
+# + function query added for testing of the nql / rpc interface
+#
+# Revision 1.9  2004/09/01 21:43:30  xabbu
+# +Moved funtion getDefaultDir from FraggleCtlPreferences to FraggleEngine for more convenience
+# +FraggleCtlModules class creation for handling content modules
+#
+# Revision 1.8  2004/08/31 16:48:19  joko
+# + def authenticate
+#
+# Revision 1.7  2004/08/31 09:34:10  joko
+# + def query_remote: don't do "getTopicById" here anymore
+#
 # Revision 1.6  2004/08/31 02:23:07  joko
 # U changes to (dummy) topics metadata (FraggleXml)
 # + def query_remote: wrapper for making remote xmlrpc call
@@ -31,12 +51,15 @@
 from fraggleConstants import *
 import FraggleXMLRPC
 import fraggleCtlPreferences
+import FraggleCtlModules
+import fraggleParserXML
 
 class FraggleEngine:
     """Back-end doing the work."""
     def __init__(self):
         self.settings = {}
         self.topics = {}
+        self.modules = FraggleCtlModules.create(self)
         self.preferences = fraggleCtlPreferences.create(self)
         self.rpc = FraggleXMLRPC.create(self, self.preferences.getConfig())
 
@@ -57,79 +80,40 @@
             else:
                 return None
 
-    def fraggleSync(self):
-        
-        # v1 - demo
-        self.topics = [ 
-            { 
-                'name': 'iNFO-Page:Test-ViaXMLRPC',
-                'mode': 'pull',
-                'result': 'item',
-                'target': {
-                    'url': 'http://netfrag.org/nfo/netfraggle.php',
-                    'method': 'nfo.getContent',
-                    'arguments': 'Test',
-                    'type': 'XMLRPC',
-                }
-            },
-            { 
-                'name': 'iNFO-Page:Home-ViaXMLRPC',
-                'mode': 'pull',
-                'result': 'item',
-                'target': {
-                    'url': 'http://netfrag.org/nfo/netfraggle.php',
-                    'method': 'nfo.getContent',
-                    'arguments': 'Home',
-                    'type': 'XMLRPC',
-                }
-            },
-            { 
-                'name': 'iNFO-PageIndex',
-                'mode': 'pull',
-                'result': 'list',
-                'target': {
-                    'url': 'http://netfrag.org/nfo/netfraggle.php',
-                    'method': 'nfo.listTopics',
-                    'arguments': ['xmlpage'],
-                    'type': 'XMLRPC',
-                }
-            },
-            { 
-                'name': 'TWiki-Test-ViaTWiki',
-                'mode': 'push',
-                'target': {
-                    'url': 'http://netfrag.org/twiki/bin/view/Main/NetFraggleTest',
-                    'type': 'TWiki',
-                }
-            },
-            { 
-                'name': 'TWiki-Test-ViaXMLRPC',
-                'mode': 'push',
-                'target': {
-                    'method': 'appendToPage',
-                    'arguments': ['NetFraggleTest'],
-                    'type': 'XMLRPC',
-                }
-            },
-        ]
-        return
-
-        # v2 - live
+    def syncTopics(self):
+        query = "GET * FROM contenttypes"
+        topicData = self.queryCms(query)
+        topictypes = topicData['1']
+      
+        for i in topictypes:
+         self.topics[i] = topictypes[i]['1']
+         
+        #print self.topics
         
-        # 1. load payload from remote side
-        fragglexml = self.rpc.FraggleSync()
-        
-        # 2. (todo) unmarshal to self.topics (hash)
-        # self.topics = unmarshal(fragglexml)
-
     def getTopics(self):
         return self.topics
     
     def getTopicById(self, id):
         return self.topics[id]
-
-    def query_remote(self, topicid):
-        topicmeta = self.getTopicById(topicid)
+    
+    def listItems(self,contentkey):
+        result = self.queryCms(str("GET creator_id, language_id, description FROM contents WITH type "+contentkey))
+        return result
+        
+    def queryCms(self,nqlquery):
+        
+        from xmlrpclib import Server,Error
+        rpc = Server('http://netfrag.org/nfo/netfraggle.php')
+        result = rpc.query(nqlquery)
+        if result['0']['error'] == '0':
+        #print result
+          return result
+      
+        #else:
+        #print result['0']['error']
+        #return result
+       
+    def query_remote(self, topicmeta):
 
         if topicmeta['target']['type'] == 'XMLRPC':
             # TODO: make FraggleXMLRPC do all stuff
@@ -156,7 +140,34 @@
                 except Error, v:
                     print "ERROR", v
         return topicdata
-                    
+
+    def authenticate(self, server, username, password):
+        from xmlrpclib import Server, Error
+        rpc = Server(server)
+        try:
+            return rpc.authenticate({'user': username, 'pass': password})
+        except Error, v:
+            print "ERROR", v
+        
+    def getDefaultDir(self):
+        """Gets location of default dir and creates it
+           if necessary. ($HOME/.pears/)"""
+        try:
+            import pearsdebug
+            savedir = pearsdebug.savedir
+        except:
+            dir = '.netfraggle'
+            savedir = os.path.expanduser(os.path.join('~', dir))
+            if len(savedir)<=len("c:\\/" + dir):
+                # problem that might occur on Win2k (no $HOME environment variable)
+                temp = os.path.join(os.path.expandvars('$USERPROFILE'), dir)
+                if temp > len("c:\\/" + dir):
+                    savedir = temp
+            # create dir if it doesn't exist
+            if not os.path.exists(savedir):
+                os.makedirs(savedir)
+        return savedir
+                   
 class urlOpener(object):
     """Opens urls."""
     def __init__(self):