Merge lp:~cwilson/spud/noflml into lp:spud

[Cian Wilson]

The automatic download of the fluidity schema for diamond is broken - it does not download correctly so you get an incomplete schema. Furthermore if you register a single non-flml schema you still get an flml option because the download option is always automatically registered, which is weird on machines where fluidity isn't even installed.

This merge removes the broken flml download from diamond and instead issues an error if no schemas are found.

[Patrick Farrell (pefarrell)]

I think the message is a bit confusing (and has a spelling mistake). How about

+ debug.deprint("The file should consist of:", 0)
+ debug.deprint(" A Verbal Description Of The Language Purpose", 0)
+ debug.deprint(" alias1=/path/to/schema/alias1", 0)
+ debug.deprint(" alias2=/path/to/schema/alias2", 0)

?

Technically the change looks fine. David, Tim: do we install the fluidity schema now by default with the package? If so, I think we should get rid of any flml-specific stuff in diamond (as much as possible, anyway).

[lp:~cwilson/spud/noflml]

517. By Cian Wilson on 2012-02-27

Updating error message.

[Cian Wilson (cwilson)]

OK, have updated the error message. I had just copied it from the one that was already there so I've updated the original too.

My understanding is that the packages install the fluidity schema but regardless the current 'default' download behavior is broken so should be fixed or removed. I obviously favor removal as I think it's broken on other levels too.

This was all the flml-specific stuff I could find based on grepping. Is there more out there that I didn't find? I'm only aware of the test xml specific stuff.

[Tim Greaves (tim-greaves)]

We do:

tmb1@borken:~$ dpkg -L fluidity | grep flml
/usr/share/diamond/schemata/flml
/usr/share/fluidity/schemas/flml
/usr/share/fluidity/schemas/flml.in
tmb1@borken:~$

[Patrick Farrell (pefarrell)]

In that case, let's go!

review: Approve

=== modified file 'diamond/bin/diamond'
--- diamond/bin/diamond	2011-09-09 12:02:21 +0000
+++ diamond/bin/diamond	2012-02-27 15:27:21 +0000
@@ -153,11 +153,21 @@
         debug.deprint("Have you registered it in /etc/diamond/schemata/ or $HOME/.diamond/schemata?", 0)
         debug.deprint("To register a schema, place a file in one of those directories, and let its name be the suffix of your language.", 0)
         debug.deprint("The file should consist of:", 0)
-        debug.deprint("  A Verbal Description Of The Language Purpose", 0)
-        debug.deprint("  Lines of the format alias=/path/to/the/schema/file.rng", 0)
-        debug.deprint("  alias= is optional, if not given default= is added automaticly")
+        debug.deprint(" A Verbal Description Of The Language Purpose", 0)
+        debug.deprint(" alias1=/path/to/schema1/file.rng", 0)
+        debug.deprint(" alias2=/path/to/schema2/file.rng", 0)
         sys.exit(1)
       
+    elif len(config.schemata) == 0:
+      debug.deprint("Could not find a schema file.", 0)
+      debug.deprint("Have you registered it in /etc/diamond/schemata/ or $HOME/.diamond/schemata?", 0)
+      debug.deprint("To register a schema, place a file in one of those directories, and let its name be the suffix of your language.", 0)
+      debug.deprint("The file should consist of:", 0)
+      debug.deprint(" A Verbal Description Of The Language Purpose", 0)
+      debug.deprint(" alias1=/path/to/schema1/file.rng", 0)
+      debug.deprint(" alias2=/path/to/schema2/file.rng", 0)
+      sys.exit(1)
+
     # if there is only one schema, use that
     elif len(config.schemata) == 1:
       suffix = config.schemata.keys()[0]

=== modified file 'diamond/diamond/config.py'
--- diamond/diamond/config.py	2011-11-03 16:21:35 +0000
+++ diamond/diamond/config.py	2012-02-27 15:27:21 +0000
@@ -48,9 +48,7 @@
 __set_default("diffadd", "lightgreen")
 __set_default("diffsub", "indianred")
 
-# Here we hard-code a default for flml
-# so that users don't have to tweak this to run it.
-schemata = {'flml': ('Fluidity markup language', { None: 'http://bazaar.launchpad.net/~fluidity-core/fluidity/4.0-release/download/head:/fluidity_options.rng-20110415014759-hdavpx17hi2vz53z-811/fluidity_options.rng'})}
+schemata = {}
 
 for dir in [os.path.join(path, "schemata") for path in dirs]:
   try: