Optimize the rule processing function to parse only once, then manipulate the parsed...

diff --git a/sfatables/runtime.py b/sfatables/runtime.py
index 235c67f..b155809 100644 (file)
--- a/sfatables/runtime.py
+++ b/sfatables/runtime.py
@@ -26,7 +26,8 @@ class SFATablesRules:
         return
 
     def apply(self, rspec):
         return
 
     def apply(self, rspec):

-        intermediate_rspec = rspec
+        doc = libxml2.parseDoc(rspec)
+        intermediate_rspec = doc

         for rule in self.sorted_rule_list:
             intermediate_rspec  = rule.apply_interpreted(intermediate_rspec)
             if (rule.terminal):
         for rule in self.sorted_rule_list:
             intermediate_rspec  = rule.apply_interpreted(intermediate_rspec)
             if (rule.terminal):

diff --git a/sfatables/sfatables b/sfatables/sfatables
index 0693020..b413ef1 100755 (executable)
--- a/sfatables/sfatables
+++ b/sfatables/sfatables
@@ -36,7 +36,6 @@ def load_xml_extensions(module, ext_dir):
         # get the filename and get rid of the ".xml" extension
         ext_name = os.path.extsep.join(os.path.splitext(os.path.basename(ext))[:-1])
         ext_dict[ext_name]=module
         # get the filename and get rid of the ".xml" extension
         ext_name = os.path.extsep.join(os.path.splitext(os.path.basename(ext))[:-1])
         ext_dict[ext_name]=module

-        print "Loaded:", ext_name, ext

 
     return ext_dict
 
 
     return ext_dict
 

diff --git a/sfatables/xmlextension.py b/sfatables/xmlextension.py
index 813cd6d..809ea36 100644 (file)
--- a/sfatables/xmlextension.py
+++ b/sfatables/xmlextension.py
@@ -9,6 +9,8 @@ from sfatables.globals import *
 
 class Xmlextension:
     def __init__(self, file_path):
 
 class Xmlextension:
     def __init__(self, file_path):

+
+        print file_path

         self.context = ""
         self.processor = ""
         self.operand = "VALUE"
         self.context = ""
         self.processor = ""
         self.operand = "VALUE"

diff --git a/sfatables/xmlrule.py b/sfatables/xmlrule.py
index 55796a9..5eb5891 100644 (file)
--- a/sfatables/xmlrule.py
+++ b/sfatables/xmlrule.py
@@ -13,7 +13,7 @@ class XMLRule:
     processors = {'match':None,'target':None}
     context = {'match':None,'target':None}
 
     processors = {'match':None,'target':None}
     context = {'match':None,'target':None}
 

-    def apply_processor(self, type, rspec, output_xpath_filter=None):
+    def apply_processor(self, type, doc, output_xpath_filter=None):

         processor = self.processors[type]
 
         # XXX TO CLEAN UP
         processor = self.processors[type]
 
         # XXX TO CLEAN UP


@@ -22,7 +22,6 @@ class XMLRule:
 
         styledoc = libxml2.parseFile(filepath)
         style = libxslt.parseStylesheetDoc(styledoc)
 
         styledoc = libxml2.parseFile(filepath)
         style = libxslt.parseStylesheetDoc(styledoc)

-        doc = libxml2.parseDoc(rspec)

         result = style.applyStylesheet(doc, None)
         if (output_xpath_filter):
             p = result.xpathNewContext()
         result = style.applyStylesheet(doc, None)
         if (output_xpath_filter):
             p = result.xpathNewContext()


@@ -30,38 +29,38 @@ class XMLRule:
             if (xpath_result == []):
                 raise Exception("Could not apply processor %s."%processor)
 
             if (xpath_result == []):
                 raise Exception("Could not apply processor %s."%processor)
 

-            stylesheet_result = xpath_result[0].content
+            stylesheet_result = xpath_result

             p.xpathFreeContext()
         else:
             p.xpathFreeContext()
         else:

-            stylesheet_result = style.saveResultToString(result)
+            stylesheet_result = result #style.saveResultToString(result)

 
         style.freeStylesheet()
 
         style.freeStylesheet()

-        doc.freeDoc()
-        result.freeDoc()
+        #doc.freeDoc()
+        #result.freeDoc()

 
         return stylesheet_result
 
 
         return stylesheet_result
 

-    def wrap_up(self, rspec):
+    def wrap_up(self, doc):

         filepath = os.path.join(sfatables_config, 'processors', self.final_processor)
 
         if not os.path.exists(filepath):
             # TODO: final_processor is not there yet
         filepath = os.path.join(sfatables_config, 'processors', self.final_processor)
 
         if not os.path.exists(filepath):
             # TODO: final_processor is not there yet

-            return rspec
+            return doc#rspec

 
         styledoc = libxml2.parseFile(filepath)
         style = libxslt.parseStylesheetDoc(styledoc)
 
         styledoc = libxml2.parseFile(filepath)
         style = libxslt.parseStylesheetDoc(styledoc)

-        doc = libxml2.parseDoc(rspec)
+        #doc = libxml2.parseDoc(rspec)

         result = style.applyStylesheet(doc, None)
         result = style.applyStylesheet(doc, None)

-        stylesheet_result = style.saveResultToString(result)
+        stylesheet_result = result #style.saveResultToString(result)

         style.freeStylesheet()
         style.freeStylesheet()

-        doc.freeDoc()
-        result.freeDoc()
+        #doc.freeDoc()
+        #result.freeDoc()

 
         return stylesheet_result
 
     def match(self, rspec):
         match_result = self.apply_processor('match',rspec,"//result/@verdict") 
 
         return stylesheet_result
 
     def match(self, rspec):
         match_result = self.apply_processor('match',rspec,"//result/@verdict") 

-        return (match_result=='True')
+        return (match_result[0].content=='True')

 
     def target(self, rspec):
         target_result = self.apply_processor('target',rspec,None)
 
     def target(self, rspec):
         target_result = self.apply_processor('target',rspec,None)