improved az list generation
authorSergio Fernandez <sergio.fernandez@fundacionctic.org>
Thu, 20 Oct 2011 12:22:11 +0200
changeset 182 0aab4e545a04
parent 181 c784a76907c7
child 183 c54341c6f890
improved az list generation
ontologies/specgen/libvocab.py
--- a/ontologies/specgen/libvocab.py	Thu Oct 20 11:30:15 2011 +0200
+++ b/ontologies/specgen/libvocab.py	Thu Oct 20 12:22:11 2011 +0200
@@ -542,25 +542,25 @@
   	def az(self):
   		"""AZ List for html doc"""
   		c_ids, p_ids, d_ids = self.vocab.azlist()
-  		az = """<div class="azlist">"""
-  		az = "%s\n<p>Classes: |" % az
-  		# print c_ids, p_ids
+  		# print c_ids, p_ids, d_ids
+
+		az = """<div class="azlist">"""
+		
+		azs = []
   		for c in c_ids:
-  			# speclog("Class "+c+" in az generation.")
-  			az = """%s <a href="#%s">%s</a> | """ % (az, str(c).replace(" ", ""), c)
-  		az = """%s\n</p>""" % az
+  			azs.append("""<a href="#%s">%s</a>""" % (str(c).strip(), c))
+  		az = "%s\n<p>Classes: %s </p> \n" % (az, " | ".join(azs))
 
-  		az = "%s\n<p>Properties: |" % az
+  		azs = []
   		for p in p_ids:
-  			# speclog("Property "+p+" in az generation.")
-  			az = """%s <a href="#%s">%s</a> | """ % (az, str(p).replace(" ", ""), p)
-  		az = "%s\n</p>" % az
+  			azs.append("""<a href="#%s">%s</a>""" % (str(p).strip(), p))
+  		az = "%s\n<p>Properties: %s </p> \n" % (az, " | ".join(azs))
 
 		if (len(d_ids)>0):
-	  		az = "%s\n<p>Datatypes: |" % az
+			azs = []
 	  		for d in d_ids:
-	  			az = """%s <a href="#%s">%s</a> | """ % (az, str(d).replace(" ", ""), d)
-	  		az = "%s\n</p>" % az
+	  			azs.append("""<a href="#%s">%s</a>""" % (str(d).strip(), d))
+			az = "%s\n<p>Datatypes: %s </p>\n" % (az, " | ".join(azs))
 
   		az = "%s\n</div>" % az
   		return(az)