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

[Cian Wilson]

When an element is a string diamond expects an attribute with a hint about the number of lines.

This merge modifies spud to add this attribute when writing out the options to file.

This fixes checkpoints (where new initial condition elements are used containing file names) so that they aren't incomplete when opened first in diamond.

[Stephan Kramer (s-kramer)]

Sounds eminently sensible. Why does it write lines="20" for any n/o lines>1 though?

[Cian Wilson (cwilson)]

Yeah, not really sure what to do there. The schema has either lines=1 or lines=20 depending on the type of string it is - basically filenames are assumed 1 and code is assumed 20. So I was just trying to emulate that.

The odd thing about this change is that I think string options that were read in with a lines attribute will be overwritten by this even though they know the right answer as they will have parsed the lines attribute at the start.

An alternative fix that I thought of was checking if lines was set when set_option is called on a string and setting an attribute then (this option is complicated a bit by the way spud stores attributes - basically as string elements with no children).

Otherwise I could try to see when we write a file whether the lines attribute has already been set and only set it if it hasn't.

[Cian Wilson (cwilson)]

Couldn't think of a robust way of doing this within spud so decided to go another way with this, fixing it in my code rather than in spud by addressing the attribute to the internal spud option path (__value/lines). Not perfect but without a major overhaul of spud it'll do.

Thanks for taking a look Stephan.

Unmerged revisions

538. By Cian Wilson on 2015-11-21

Fix string_type elements to have a lines attribute.

This fixes checkpoints so that they aren't missing this attribute when first opened in diamond.

=== modified file 'src/spud.cpp'
--- src/spud.cpp	2015-08-12 17:43:53 +0000
+++ src/spud.cpp	2015-11-21 04:58:37 +0000
@@ -1706,6 +1706,7 @@
     ele->LinkEndChild(data_ele);
 
     for(deque< pair<string, Option*> >::const_iterator iter = children.begin();iter != children.end();iter++){
+      string str = iter->second->data_as_string();
       if(iter->second->is_attribute){
         // Add attribute
         ele->SetAttribute(iter->second->node_name, iter->second->data_as_string());
@@ -1724,6 +1725,7 @@
               break;
             case(SPUD_STRING):
               child_ele->SetValue("string_value");
+              child_ele->SetAttribute("lines", (std::count(str.begin(), str.end(), '\n') > 0 ? "20" : "1"));
               break;
             default:
               cerr << "SPUD ERROR: Invalid option type" << endl;