fixed data loader for filedata.

mainline/ext/std/tools/view.py

@@ -92,6 +92,7 @@ def export_to_str(out_format, paths, loader, loader_prev, nest_regions):
 
         if out_format == 'txt':
             result += mpp.utils.serialize_to_txt(data, root_name = "data") + "\n"
+            #cout_txt(data)
         elif out_format == 'xml':
             result += mpp.utils.serialize_to_xml(data, root_name = "data") + "\n"
         elif out_format == 'python':
@@ -201,4 +202,44 @@ def append_diff_list(main_list, prev_list):
     result = []
     for metric in sorted(merged_list.keys()):
         result.append({'metric':metric, 'count':merged_list[metric]['count'], '__diff__':merged_list[metric]['__diff__']})
-    return result
+    return result
+
+def cout_txt(data):
+    print "FILE DATA"
+    for key in data['file-data'].keys():
+        if key == 'regions':
+            print "dumping regions"
+            for region in data['file-data'][key]:
+                print 'region:', region['info']
+                for namespace in region['data'].keys():
+                    diff_data = None
+                    diff_str = ""
+                    if '__diff__' in region['data'][namespace].keys():
+                        diff_data = region['data'][namespace]['__diff__']
+                    for field in region['data'][namespace].keys():
+                        if field == '__diff__':
+                            continue
+                        if diff_data != None:
+                            diff_str = "[" + ("+" if diff_data[field] >= 0 else "") + str(diff_data[field]) + "]"
+                        print namespace, field, region['data'][namespace][field], diff_str
+        else:
+            print "dumping data", key, data['file-data']
+            
+            
+            diff_data = None
+            diff_str = ""
+            namespace = key
+            if '__diff__' in data['file-data'][namespace].keys():
+                diff_data = data['file-data'][namespace]['__diff__']
+            for field in data['file-data'][namespace].keys():
+                if field == '__diff__':
+                    continue
+                if diff_data != None:
+                    #diff_str = "[" + ("+" if diff_data[field] >= 0 else "") + str(diff_data[field]) + "]"
+                    pass
+                print namespace, field, data['file-data'][namespace][field], diff_str
+    print "AGGREGATED DATA"
+    for namespace in data['aggregated-data'].keys():
+        for field in data['aggregated-data'][namespace].keys():
+            print data['aggregated-data'][namespace][field]
+    

mainline/mpp/api.py

@@ -70,6 +70,8 @@ class LoadableData(Data):
         self.changed_namespaces = []
 
     def load_namespace(self, namespace):
+        if self.region_id == None and self.loader.get_namespace(namespace).are_regions_supported() == True:
+            return
         try:
             row = self.loader.db.get_row(namespace, self.file_id, self.region_id)
         except Exception:

mainline/tests/general/test_std_code_java/test_parser_view_files_stdout.gold.txt

@@ -729,8 +729,6 @@ data:
 .   .   .   .   .   .   .   .   .   std.code.complexity: 
 .   .   .   .   .   .   .   .   .   .   cyclomatic="0"
 .   .   .   .   .   .   .   .   subregions:
-.   .   std.code.complexity: 
-.   .   .   cyclomatic="0"
 .   subfiles:
 .   subdirs:
 .   aggregated-data: