Index: trunk/webapp/abscontrol/views.py =================================================================== diff --git a/trunk/webapp/abscontrol/views.py b/trunk/webapp/abscontrol/views.py --- a/trunk/webapp/abscontrol/views.py (revision 151) +++ b/trunk/webapp/abscontrol/views.py (revision 152) @@ -1,5 +1,6 @@ from django.shortcuts import render_to_response, redirect from abscontrol.models import Profile, Pattern, AntennaDown, AntennaUp +from util.readABSFile import readABSFile txtAntenna = "[[0.5,0.5,0.5,0.5,0.5,0.5,0.5,0.5]," \ "[1.0,1.0,1.0,1.0,1.0,1.0,1.0,1.0]," \ @@ -248,6 +249,11 @@ for chunk in txtFilename.chunks(): destination.write(chunk) destination.close() + filename = '/tmp/'+txtFilename.name + readFile = readABSFile(filename) + expName, num_patterns, patterns = readFile.getMetadata() + + ''' f = open('/tmp/'+txtFilename.name, 'r') newContent = f.readlines() f.close() @@ -262,14 +268,14 @@ num_patterns = line[pos+1:].strip() else: content += line - + ''' else: txtFilename = "Error" - content = "Error" + #content = "Error" expName = "" num_patterns = 0 - return render_to_response('abscontrol/upload.html', {'txtFilename': txtFilename, 'content' : content, + return render_to_response('abscontrol/upload.html', {'txtFilename': txtFilename, 'patterns' : patterns, 'expName' : expName, 'num_patterns' : num_patterns, }) Index: trunk/webapp/templates/abscontrol/upload.html =================================================================== diff --git a/trunk/webapp/templates/abscontrol/upload.html b/trunk/webapp/templates/abscontrol/upload.html --- a/trunk/webapp/templates/abscontrol/upload.html (revision 151) +++ b/trunk/webapp/templates/abscontrol/upload.html (revision 152) @@ -13,9 +13,24 @@

{{ expName }}

{{ num_patterns }}

- -

{{ content }}

+ {% if patterns %} +
+ {% for element in patterns %} +
+ +
+
+ +

{{ element.up }}

+
+
+ +

{{ element.down }}

+
+ {% endfor %} +
+ {% endif %} {% endblock %} Index: trunk/webapp/util/readABSFile.py =================================================================== diff --git a/trunk/webapp/util/readABSFile.py b/trunk/webapp/util/readABSFile.py --- a/trunk/webapp/util/readABSFile.py (revision 151) +++ b/trunk/webapp/util/readABSFile.py (revision 152) @@ -16,12 +16,14 @@ self.number_patterns = 0 self.patterns = {} - def readFile(self, path): - f = open(path, 'r') + def readFile(self): + f = open(self.fileName, 'r') self.content = f.readlines() f.close() def getMetadata(self): + self.readFile() + newLine = self.content[0].replace("'","") pos = newLine.find("=") self.exp_name = newLine[pos+1:].strip() @@ -30,6 +32,8 @@ self.number_patterns = int(self.content[2][pos+1:].strip()) self.patterns = self.getPatterns(self.content[3:]) + + return self.exp_name, self.number_patterns, self.patterns def getPatterns(self, content): lsPattern = []