924c9c84696afd8f963addd2b36b969087b2f807 tdreszer Fri Apr 15 18:05:53 2011 -0700 The param should have been TRE=joined diff --git src/inc/ra.h src/inc/ra.h index a2a925b..b7b66c0 100644 --- src/inc/ra.h +++ src/inc/ra.h @@ -1,34 +1,34 @@ /* Stuff to parse .ra files. Ra files are simple text databases. * The database is broken into records by blank lines. * Each field takes a line. The name of the field is the first * word in the line. The value of the field is the rest of the line. * * This file is copyright 2002 Jim Kent, but license is hereby * granted for all use - public, private or commercial. */ #ifndef RA_H -struct hash *raNextStanza(struct lineFile *lf,boolean unjoined); +struct hash *raNextStanza(struct lineFile *lf,boolean joined); // Return a hash containing next record, or NULL at end of file. // Will ignore '#' comments and if requsted, joins lines ending in continuation char. // freeHash this when done. Note this will free the hash keys and values as well, // so you'll have to cloneMem them if you want them for later. #define raNextRecord(lf) raNextStanza((lf),TRUE) #define raNextRecordUnjoined(lf) raNextStanza((lf),FALSE) -struct slPair *raNextStanzAsPairs(struct lineFile *lf,boolean unjoined); +struct slPair *raNextStanzAsPairs(struct lineFile *lf,boolean joined); // Return ra stanza as an slPair list instead of a hash. Handy to preserve the order. // Will ignore '#' comments and if requsted, join lines ending in continuation char '\'. #define raNextRecordAsSlPairList(lf) raNextStanzAsPairs((lf),TRUE) #define raNextRecordUnjoinedAsSlPairList(lf) raNextStanzAsPairs((lf),FALSE) struct slPair *raNextStanzaLinesAndUntouched(struct lineFile *lf); // Return list of lines starting from current position, up through last line of next stanza. // May return a few blank/comment lines at end with no real stanza. // Will join continuation lines, allocating memory as needed. // returns pairs with name=joined line and if joined, // val will contain raw lines '\'s and linefeeds, else val will be NULL. boolean raSkipLeadingEmptyLines(struct lineFile *lf, struct dyString *dy); /* Skip leading empty lines and comments. Returns FALSE at end of file. * Together with raNextTagVal you can construct your own raNextRecord....