From 636773dd9045ebf88e3c34fe7b136e0760b86d1e Mon Sep 17 00:00:00 2001
From: grammarware <vadim@grammarware.net>
Date: Sat, 23 Aug 2008 19:04:10 +0000
Subject: [PATCH] cleaning up obsolete bits

git-svn-id: https://slps.svn.sourceforge.net/svnroot/slps@213 ab42f6e0-554d-0410-b580-99e487e6eeb2
---
 shared/xsl/ldf2samples.xslt                   | 25 -------------------
 topics/extraction/ldf2set/Makefile            |  5 ++--
 .../ldf2set/{xml2set.py => ldf2set.py}        |  2 +-
 topics/fl/lci/Makefile                        |  4 +--
 4 files changed, 6 insertions(+), 30 deletions(-)
 delete mode 100644 shared/xsl/ldf2samples.xslt
 rename topics/extraction/ldf2set/{xml2set.py => ldf2set.py} (97%)

diff --git a/shared/xsl/ldf2samples.xslt b/shared/xsl/ldf2samples.xslt
deleted file mode 100644
index 95287471..00000000
--- a/shared/xsl/ldf2samples.xslt
+++ /dev/null
@@ -1,25 +0,0 @@
-<xsl:stylesheet version = '1.0'
-    xmlns:xsl='http://www.w3.org/1999/XSL/Transform'
-    xmlns:bgf="http://planet-sl.org/bgf"
-    xmlns:ldf="http://planet-sl.org/ldf">
-  <xsl:output method="xml" encoding="UTF-8"/>
-
-  <xsl:template match="/ldf:document">
-      <ldf:document xmlns:ldf="http://planet-sl.org/ldf">
-         <xsl:apply-templates select="content"/>
-      </ldf:document>
-  </xsl:template>
-
-  <xsl:template match="sample">
-    <xsl:copy-of select="."/>
-  </xsl:template>
-  
-  <xsl:template match="runnable">
-    <xsl:copy-of select="."/>
-  </xsl:template>
-
-  <xsl:template match="text"/>
-  <xsl:template match="title"/>
-  <xsl:template match="grammar"/>
-
-</xsl:stylesheet>
diff --git a/topics/extraction/ldf2set/Makefile b/topics/extraction/ldf2set/Makefile
index 25558c05..737a8021 100755
--- a/topics/extraction/ldf2set/Makefile
+++ b/topics/extraction/ldf2set/Makefile
@@ -1,6 +1,7 @@
+build:
+
 test:
-	xsltproc ../../../shared/xsl/ldf2samples.xslt ../../fl/ldf/fl.ldf > samples.xml
-	python xml2set.py samples.xml samples
+	python ldf2set.py ../../fl/ldf/fl.ldf samples
 
 clean:
 	rm -rf samples/* samples.xml *.pyc
diff --git a/topics/extraction/ldf2set/xml2set.py b/topics/extraction/ldf2set/ldf2set.py
similarity index 97%
rename from topics/extraction/ldf2set/xml2set.py
rename to topics/extraction/ldf2set/ldf2set.py
index 8f4931a9..4b5179a4 100755
--- a/topics/extraction/ldf2set/xml2set.py
+++ b/topics/extraction/ldf2set/ldf2set.py
@@ -49,7 +49,7 @@ def unpacksamples(where,dir):
   torun.write(line+'\n')
   torun.close()
   cx+=1
- print cx,'samples in the test set.'
+ print cx-1,'samples in the test set.'
 
 if __name__ == "__main__":
  print 'Sample Set Extractor'
diff --git a/topics/fl/lci/Makefile b/topics/fl/lci/Makefile
index f62c1a14..efe8b25b 100644
--- a/topics/fl/lci/Makefile
+++ b/topics/fl/lci/Makefile
@@ -8,8 +8,8 @@ test:
 
 check:
 	${validator} lcf fl.lcf
-	ls -1 xbgf/*.xbgf | xargs -1 ${validator} xbgf
-	ls -1  bgf/*.bgf  | xargs -1 ${validator} bgf
+	ls -1 xbgf/*.xbgf | xargs -n1 ${validator} xbgf
+	ls -1  bgf/*.bgf  | xargs -n1 ${validator} bgf
 
 clean:
 	rm -f *~