Changeset 812 for vanHelsing/trunk/src

Timestamp:

Jan 13, 2010, 12:35:53 PM (15 years ago)

Author:

slederer

Message:

Korrekte Syntax bei DirAddress-Elementen, Verbesserungen bei Includes

Location:

vanHelsing/trunk/src

Files:

• bcfg.py (modified) (6 diffs)
• resource.py (modified) (3 diffs)

vanHelsing/trunk/src/bcfg.py

@@ -26 +26 @@
         self.resource_type = resource_type
         self.filename = filename
-        self.resources = resource.Resource(level=0)
+        self.resources = resource.Root(level=0)
         self.resources.name="<root>"
 
@@ -33 +33 @@
         #print self.resources
         
-    def write(self):
-        pass
+    def write(self, filename=None):
+        if(filename==None):
+            filename=self.filename
+        f=open(filename,"w")
+        f.write(str(self.getRoot()))
+        f.close()
 
     def getResourceById(self,theid):
@@ -60 +64 @@
                 line=line[:commentStart].strip()
                 #curRes.add_comment(inlinecomment)
+
+            if len(line)>0 and line[0]=='@':
+                includepath=line[1:].strip()
+                print "include " +includepath
+                self.parse(self.resources,open(includepath,"r"),0)
 
             if rxp_closebrace.match(line):
@@ -96 +105 @@
             if item:
                 name = item.group(1)
-                value = item.group(2)
+                value = item.group(2).strip()
                 #print "item:",name,value
                 newRes=resource.Resource(level+1)
@@ -120 +129 @@
     pass
 
+def createClient(clientname,clientaddr,catalog,password):
+    newclient=resource.Client(1,"Client")
+    newclient.add("Name",clientname)
+    newclient.add("Address",clientaddr)
+    #newclient.add("FDPort",fdport)
+    newclient.add("Catalog",catalog)
+    newclient.add("Password",password)
+    return newclient
+
 if __name__ == "__main__":
     
     dirdcfg = DirdConfig("test.conf")
     dirdcfg.read()
-    #print dirdcfg.getResourceById(174)
-    jobs=dirdcfg.getResourceByName("Job")
-    for j in jobs:
-        print j.getByName("Name")[0].value
-    d=dirdcfg.getResourceByName("ip")[1]
-    print d
 
     job=resource.Job(1,"Job")
@@ -140 +152 @@
     root.add_item(job)
 
-    print root
+    newclient=createClient("testclient-fd","testclient","MyCatalog","testpassword")
+    root.add_item(newclient)
+
+    dirdcfg.write("test.conf.out")
     sys.exit(0)

vanHelsing/trunk/src/resource.py

@@ -22 +22 @@
 
     def __str__(self):
+
+        equalsign_hack=[ 'diraddresses', 'ip', 'ipv4' ]
+
         s = "\n".join(self.comments) 
         indent="  "*self._recurselevel
@@ -29 +32 @@
                 return indent+self.name+" = "+self.value+"\n";
 
-        s += indent+self.name + " {\n"
+        if self.name.lower() in equalsign_hack:
+            s += indent+self.name + " = {\n";
+        else:
+            s += indent+self.name + " {\n"
         for d in self.items:
             s += str(d)
@@ -71 +77 @@
         return result
                           
+
+class Root(Resource):
+    def __str__(self):
+        s=""
+        for d in self.items:
+            s += str(d)
+        return s
 
 class Director(Resource):