SHA1 Hash:	0e924820bffe17d305c7f64c05a4f6eed65f169e
Date:	2008-08-24 20:16:43
User:	eric
Comment:	Tidy up tagview code.
Timelines:	ancestors | descendants | both | eric-tagview-rework | trunk
Other Links:	files | ZIP archive | manifest

• branch=trunk inherited from [a28c83647d]
• sym-eric-tagview-rework inherited from [3984b1b2c1]
• sym-trunk inherited from [a28c83647d]

Modified src/name.c from [f2384ef316] to [8550ff74c5].

@@ -120,11 +120,11 @@
     "  FROM tagxref JOIN event ON rid=objid"
     " WHERE tagid=(SELECT tagid FROM tag WHERE tagname=%Q||%Q)"
     "   AND tagtype>0"
     "   AND value IS NULL"
     " ORDER BY event.mtime DESC",
-	pPrefix,
+    pPrefix,
     pName
   );
   blob_zero(pUuid);
   while( db_step(&q)==SQLITE_ROW ){
     count++;
@@ -135,11 +135,11 @@
   }
   db_finalize(&q);
   return count;
 }
 int sym_tag_to_uuid(const char *pName, Blob *pUuid){
-	return tag_to_uuid(pName,pUuid,"sym-");
+    return tag_to_uuid(pName,pUuid,"sym-");
 }
 
 /*
 ** COMMAND:  test-name-to-uuid
 **

Modified src/tagview.c from [49b12135cb] to [0c21590de1].

@@ -159,10 +159,31 @@
     tagview_page_default();
   }
   style_footer();
 }
 
+#undef TAGVIEW_DEFAULT_FILTER
+
+/*
+** Generate a timeline for the chosen tag
+*/
+void tagview_print_timeline(char const *pName, char const *pPrefix){
+  char *zSql;
+  Stmt q;
+  zSql = mprintf("%s AND EXISTS (SELECT 1"
+         " FROM tagxref"
+         "  WHERE tagxref.rid = event.objid"
+         "  AND tagxref.tagid = (SELECT tagid FROM tag"
+         "      WHERE tagname = %Q||%Q))"
+         " ORDER BY 3 desc",
+         timeline_query_for_www(), pPrefix, pName);
+  db_prepare(&q, zSql);
+  free(zSql);
+  www_print_timeline(&q);
+  db_finalize(&q);
+}
+
 /*
 ** WEBPAGE: /tagview
 */
 void tagview_page(void){
   char const *zName = 0;
@@ -171,43 +192,17 @@
     login_needed();
   }
   login_anonymous_available();
   if( 0 != (zName = P("name")) ){
     Blob uuid;
-    char *zSql;
-    Stmt q;
+    style_header("Tagged Baselines");
+    @ <h2>%s(zName):</h2>
     if( sym_tag_to_uuid(zName, &uuid) > 0){
-      style_header("Tagged Baselines");
-      @ <h2>%s(zName):</h2>
-      zSql = mprintf("%s AND EXISTS (SELECT 1"
-             " FROM tagxref"
-             "  WHERE tagxref.rid = event.objid"
-             "  AND tagxref.tagid = (SELECT tagid FROM tag"
-             "      WHERE tagname = 'sym-'||%Q))"
-             " ORDER BY 3 desc",
-             timeline_query_for_www(), zName);
-      db_prepare(&q, zSql);
-      free(zSql);
-      www_print_timeline(&q);
-      db_finalize(&q);
+      tagview_print_timeline(zName, "sym-");
     }else if( tag_to_uuid(zName, &uuid, "") > 0){
-      style_header("Tagged Baselines");
-      @ <h2>%s(zName):</h2>
-      zSql = mprintf("%s AND EXISTS (SELECT 1"
-             " FROM tagxref"
-             "  WHERE tagxref.rid = event.objid"
-             "  AND tagxref.tagid = (SELECT tagid FROM tag"
-             "      WHERE tagname = %Q))"
-             " ORDER BY 3 desc",
-             timeline_query_for_www(), zName);
-      db_prepare(&q, zSql);
-      free(zSql);
-      www_print_timeline(&q);
-      db_finalize(&q);
-    }else{
-      style_header("TaggedBaselines");
-      @ <h2>%s(zName):</h2>
+      tagview_print_timeline(zName, "");
+    }else{
       @ There is no artifact with this tag.
     }
   }else{
     Stmt q;
     const char *prefix = "sym-";
@@ -239,7 +234,5 @@
     @ </ul>
     db_finalize(&q);
   }
   style_footer();
 }
-
-#undef TAGVIEW_DEFAULT_FILTER