sv1-commits Mailing List for Sonic Visualiser (Page 5)

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

Revision: 1663
          http://sv1.svn.sourceforge.net/sv1/?rev=1663&view=rev
Author:   cannam
Date:     2009-10-20 15:11:03 +0000 (Tue, 20 Oct 2009)

Log Message:
-----------

* Add version, date, confidence; link to svl files

Modified Paths:
--------------
    annotation-converter/converter.cpp
    annotation-converter/index-all.sh

Modified: annotation-converter/converter.cpp
===================================================================

--- annotation-converter/converter.cpp	2009-10-19 14:51:15 UTC (rev 1662)
+++ annotation-converter/converter.cpp	2009-10-20 15:11:03 UTC (rev 1663)
@@ -20,7 +20,7 @@
 void
 usage(char *name)
 {
-    cerr << "Usage: " << name << " file.lab [file2.lab ...] [-o file.ttl]" << endl;
+    cerr << "Usage: " << name << " [-v version] [-d date] file.lab [file2.lab ...] [-o file.ttl]" << endl;
     cerr << "Default output filename is annotations.ttl" << endl;
     exit(2);
 }
@@ -308,9 +308,11 @@
     store.addPrefix("event", "http://purl.org/NET/c4dm/event.owl#");
     store.addPrefix("rdfs", "http://www.w3.org/2000/01/rdf-schema#");
     store.addPrefix("tl", "http://purl.org/NET/c4dm/timeline.owl#");
-    store.addPrefix("vamp", "http://purl.org/ontology/vamp/");
 
     QString outfile = "annotations.ttl";
+    QString version;
+    QString date;
+    QString confidence;
 
     for (int i = 1; i < argc; ++i) {
 	if (!strcmp(argv[i], "-o") && i < argc-1) {
@@ -319,10 +321,42 @@
 	    cerr << "will write to file: " << outfile.toStdString() << endl;
 	    continue;
 	}
+	if (!strcmp(argv[i], "-v") && i < argc-1) {
+	    ++i;
+	    version = argv[i];
+	    cerr << "will note version: " << version.toStdString() << endl;
+	    continue;
+	}
+	if (!strcmp(argv[i], "-d") && i < argc-1) {
+	    ++i;
+	    date = argv[i];
+	    cerr << "will note date: " << date.toStdString() << endl;
+	    continue;
+	}
+	if (!strcmp(argv[i], "-c") && i < argc-1) {
+	    ++i;
+	    confidence = argv[i];
+	    cerr << "will note confidence: " << confidence.toStdString() << endl;
+	    continue;
+	}
 	cerr << "reading file: " << argv[i] << endl;
 	readFile(store, argv[i]);
     }
 
+    store.add(Triple("#", "a", store.expand("foaf:Document")));
+
+    if (version != "") {
+	store.addPrefix("ov", "http://open.vocab.org/terms/");
+	store.add(Triple("#", "ov:versionnumber", Node(Node::Literal, version)));
+    }
+    if (date != "") {
+	store.add(Triple("#", "dc:created", Node(Node::Literal, date)));
+    }
+    if (confidence != "") {
+	store.addPrefix("ov", "http://open.vocab.org/terms/");
+	store.add(Triple("#", "ov:confidence", Node(Node::Literal, confidence)));
+    }
+
     cerr << "done, saving..." << endl;
 
     store.save(outfile);

Modified: annotation-converter/index-all.sh
===================================================================
--- annotation-converter/index-all.sh	2009-10-19 14:51:15 UTC (rev 1662)
+++ annotation-converter/index-all.sh	2009-10-20 15:11:03 UTC (rev 1663)
@@ -1,16 +1,24 @@
 #!/bin/sh
 
+# Run from within Annotations_(whatever)/all
+
 label() {
     case "$1" in
-	seg) echo "Structural segmentation:";;
-	key) echo "Key changes:";;
-	chord) echo "Chords:";;
-	beat) echo "Beats:";;
+	seg) echo -n "Structural segmentation";;
+	key) echo -n "Key changes";;
+	chord) echo -n "Chords";;
+	beat) echo -n "Beats";;
     esac
 }
 
+echo "<h2>Available annotations</h2><ul>" > ../index.html
 for x in *; do
+    ( cd .. ; tar czf "$x Annotations.tar.gz" */"$x" )
+    (
+    echo "<li><a href=\"$x.html\">$x</a><br>" >> ../index.html
     echo "<h2>$x</h2>"
+    echo "<a href=\"$x Annotations.tar.gz\">All $x annotations in a single tar.gz file</a>"
+    firsttrack="yes"
     for y in "$x"/*; do
 	if [ -d "$y" ]; then
 	    album=`grep dc:title "$y"/*.ttl | sed 's/^.*dc:title //' | \
@@ -23,34 +31,48 @@
 		base="$y/`basename \"$z\" .ttl`"
 		echo "<ul>"
 		all=""
+		first="yes"
 		for q in seg key chord beat; do
-		    if [ -f "../$q/$base.txt" ]; then
+		    if [ -f "../$q/$base.txt" ] || [ -f "../${q}lab/$base.lab" ]; then
+			if [ -n "$firsttrack" ]; then
+			    if [ -z "$first" ]; then
+				echo "; " >> ../index.html
+			    fi
+			    first=""
+			    label $q >> ../index.html
+			fi
 			echo "<li>"
 			label $q
-			echo "<a href=\"$q/$base.txt\">csv</a>"
-			echo "<a href=\"$q/$base.ttl\">rdf</a>"
+			echo ":"
+			if [ -f "../$q/$base.txt" ]; then
+			    echo "<a href=\"$q/$base.txt\">csv</a>"
+			    echo "<a href=\"$q/$base.ttl\">rdf</a>"
+			else
+			    echo "<a href=\"${q}lab/$base.lab\">csv</a>"
+			    echo "<a href=\"${q}lab/$base.ttl\">rdf</a>"
+			fi
+			if [ -f "../$q/$base.svl" ]; then
+			    echo "<a href=\"$q/$base.svl\">svl</a>"
+			elif [ -f "../${q}lab/$base.svl" ]; then
+			    echo "<a href=\"${q}lab/$base.svl\">svl</a>"
+			fi
 			case $q in
 			    seg) ;;
 			    *) all=true;;
 			esac
-		    elif [ -f "../${q}lab/$base.lab" ]; then
-			echo "<li>"
-			label $q
-			echo "<a href=\"${q}lab/$base.lab\">csv</a>"
-			echo "<a href=\"${q}lab/$base.ttl\">rdf</a>"
-			case $q in
-			    seg) ;;
-			    *) all=true;;
-			esac
 		    fi
 		done
 		if [ -n "$all" ]; then
 		    echo "<li>All of the above: <a href=\"all/$base.ttl\">rdf</a>"
 		fi
 		echo "</ul>"
+		firsttrack=""
 	    done
 	    echo "</ol>"
 	fi
     done
+    echo "</li>" >> ../index.html
+    ) > ../"$x".html
 done
+echo "</ul>" >> ../index.html
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




2006	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep (25)	Oct (57)	Nov (25)	Dec (11)
2007	Jan (36)	Feb (34)	Mar (55)	Apr (41)	May (25)	Jun (27)	Jul (22)	Aug (16)	Sep (33)	Oct (52)	Nov (79)	Dec (28)
2008	Jan (27)	Feb (56)	Mar (38)	Apr (32)	May (22)	Jun (55)	Jul (48)	Aug (10)	Sep (23)	Oct (32)	Nov (56)	Dec (71)
2009	Jan (35)	Feb (61)	Mar (52)	Apr (3)	May (18)	Jun (24)	Jul (13)	Aug (20)	Sep (27)	Oct (29)	Nov	Dec (1)
2010	Jan (3)	Feb (5)	Mar (8)	Apr (1)	May (20)	Jun (15)	Jul (8)	Aug (4)	Sep (3)	Oct	Nov (1)	Dec
2011	Jan (3)	Feb (1)	Mar	Apr (9)	May	Jun	Jul	Aug (3)	Sep	Oct (3)	Nov (2)	Dec
2012	Jan	Feb	Mar	Apr	May	Jun	Jul (1)	Aug	Sep	Oct	Nov	Dec
2013	Jan	Feb	Mar	Apr	May	Jun	Jul (2)	Aug	Sep	Oct	Nov	Dec