Changeset 10681 in genesis

Timestamp:

May 6, 2012, 1:37:51 PM (13 years ago)

Author:

rick

Message:

Content-Length header should help us making fetch more happy with regards to file retrival.

Related-To: beheer#209

File:

• tools/gformat.py (modified) (1 diff)

tools/gformat.py

@@ -942 +942 @@
   uri = base_uri.strip('/').split('/')
 
-  output = ""
+  output = "Template Holder"
+  content_type='text/plain'
   if base_uri.endswith('/create/network.kml'):
-      output += "Content-type:application/vnd.google-earth.kml+xml\r\n\r\n"
-      output += make_network_kml.make_graph()
+      content_type='application/vnd.google-earth.kml+xml'
+      output = make_network_kml.make_graph()
   elif not uri[0]:
     if is_text_request():
-      output += "Content-type:text/plain\r\n\r\n"
-      output += '\n'.join(get_hostlist())
+      content_type = 'text/plain'
+      output = '\n'.join(get_hostlist())
     else:
-      output += "Content-type:text/html\r\n\r\n"
-      output += generate_title(get_hostlist())
+      content_type = 'text/html'
+      output = generate_title(get_hostlist())
   elif len(uri) == 1:
     if is_text_request():
-      output += "Content-type:text/plain\r\n\r\n"
-      output += generate_node(uri[0])
+      content_type = 'text/plain'
+      output = generate_node(uri[0])
     else:
-      output += "Content-type:text/html\r\n\r\n"
-      output += generate_node_overview(uri[0])
+      content_type = 'text/html'
+      output = generate_node_overview(uri[0])
   elif len(uri) == 2:
-    output += "Content-type:text/plain\r\n\r\n"
-    output += generate_config(uri[0], uri[1])
+    content_type = 'text/plain'
+    output = generate_config(uri[0], uri[1])
   else:
     assert False, "Invalid option"
+
+  print "Content-Type: %s" % content_type
+  print "Content-Length: %s" % len(output)
+  print ""
   print output