Change behaviour of s1kd-aspp -c option

Now enables searching for ACTs/CCTs rather than disabling it, and
user-defined ACTs (-A) and CCTs (-C) can be used in addition to the
referenced ACT/CCT.

Author: kibook

tools/s1kd-aspp/README.md

@@ -35,7 +35,7 @@ The ID to use for the inline applicability annotation representing the whole dat
 Add a CCT to use when generating display text for conditions. Multiple CCT data modules can be used by specifying this option multiple times.
 
 -c  
-Normally, if neither the -A nor -C options are specified, the tool will search for the ACT/CCT in the current directory using the ACT reference in each input data module. But if this option is specified, it will not search for ACT(s)/CCT(s) referenced by the data module(s). Only the applicability property attributes in the data module(s) will be used to generate the display text.
+Search for the ACT and CCT referenced by each data module, and add them to the list of ACTs/CCTs to use when generating display text for that data module.
 
 -d  
 Dump the built-in XSLT used to generate display text for applicability statements.

tools/s1kd-aspp/doc/DMC-S1000DTOOLS-A-00-0Q-00-00A-040A-D_EN-CA.XML

@@ -6,10 +6,10 @@
       <dmIdent>
         <dmCode modelIdentCode="S1000DTOOLS" systemDiffCode="A" systemCode="00" subSystemCode="0" subSubSystemCode="Q" assyCode="00" disassyCode="00" disassyCodeVariant="A" infoCode="040" infoCodeVariant="A" itemLocationCode="D"/>
         <language languageIsoCode="en" countryIsoCode="CA"/>
-        <issueInfo issueNumber="007" inWork="00"/>
+        <issueInfo issueNumber="008" inWork="00"/>
       </dmIdent>
       <dmAddressItems>
-        <issueDate year="2018" month="08" day="01"/>
+        <issueDate year="2018" month="08" day="02"/>
         <dmTitle>
           <techName>s1kd-aspp(1) | s1kd-tools</techName>
         </dmTitle>
@@ -39,7 +39,7 @@
         <unverified/>
       </qualityAssurance>
       <reasonForUpdate id="rfu-0001" updateReasonType="urt02" updateHighlight="1">
-        <simplePara>Try finding ACT/CCT using data module ACT reference if none are specified.</simplePara>
+        <simplePara>Change behaviour of -c option.</simplePara>
       </reasonForUpdate>
     </dmStatus>
   </identAndStatusSection>
@@ -94,10 +94,10 @@
                 <para>Add a CCT to use when generating display text for conditions. Multiple CCT data modules can be used by specifying this option multiple times.</para>
               </listItemDefinition>
             </definitionListItem>
-            <definitionListItem changeType="add" reasonForUpdateRefIds="rfu-0001" changeMark="1">
+            <definitionListItem>
               <listItemTerm>-c</listItemTerm>
               <listItemDefinition>
-                <para>Normally, if neither the -A nor -C options are specified, the tool will search for the ACT/CCT in the current directory using the ACT reference in each input data module. But if this option is specified, it will not search for ACT(s)/CCT(s) referenced by the data module(s). Only the applicability property attributes in the data module(s) will be used to generate the display text.</para>
+                <para changeType="modify" reasonForUpdateRefIds="rfu-0001" changeMark="1">Search for the ACT and CCT referenced by each data module, and add them to the list of ACTs/CCTs to use when generating display text for that data module.</para>
               </listItemDefinition>
             </definitionListItem>
             <definitionListItem>

tools/s1kd-aspp/doc/s1kd-aspp.1

@@ -1,6 +1,6 @@
 .\" Automatically generated by Pandoc 1.19.2.1
 .\"
-.TH "s1kd\-aspp" "1" "2018\-08\-01" "" "s1kd\-tools"
+.TH "s1kd\-aspp" "1" "2018\-08\-02" "" "s1kd\-tools"
 .hy
 .SH NAME
 .PP
@@ -59,13 +59,9 @@ times.
 .RE
 .TP
 .B \-c
-Normally, if neither the \-A nor \-C options are specified, the tool
-will search for the ACT/CCT in the current directory using the ACT
-reference in each input data module.
-But if this option is specified, it will not search for ACT(s)/CCT(s)
-referenced by the data module(s).
-Only the applicability property attributes in the data module(s) will be
-used to generate the display text.
+Search for the ACT and CCT referenced by each data module, and add them
+to the list of ACTs/CCTs to use when generating display text for that
+data module.
 .RS
 .RE
 .TP

tools/s1kd-aspp/s1kd-aspp.c

@@ -21,7 +21,7 @@
 #include "identity.h"
 
 #define PROG_NAME "s1kd-aspp"
-#define VERSION "1.1.0"
+#define VERSION "1.1.1"
 
 /* ID for the inline <applic> element representing the whole data module's
  * applicability. */
@@ -476,26 +476,13 @@ void find_cross_ref_tables(xmlDocPtr doc, xmlNodePtr acts, xmlNodePtr ccts)
 	}
 }
 
-/* Remove all ACTs/CCTs from the cross-reference table list. */
-void clear_ct(xmlNodePtr ct)
-{
-	xmlNodePtr cur;
-	cur = ct->children;
-	while (cur) {
-		xmlNodePtr next;
-		next = cur->next;
-		xmlUnlinkNode(cur);
-		xmlFreeNode(cur);
-		cur = next;
-	}
-}
-
 void processFile(const char *in, const char *out, bool xincl, bool process,
 	bool genDispText, xmlNodePtr acts, xmlNodePtr ccts, bool findcts)
 {
 	xmlDocPtr doc;
 	xmlXPathContextPtr ctx;
 	xmlXPathObjectPtr obj;
+	xmlNodePtr all_acts, all_ccts;
 
 	doc = xmlReadFile(in, NULL, PARSE_OPTS);
 
@@ -504,7 +491,15 @@ void processFile(const char *in, const char *out, bool xincl, bool process,
 	}
 
 	if (findcts) {
-		find_cross_ref_tables(doc, acts, ccts);
+		/* Copy the user-defined ACTs/CCTs. */
+		all_acts = xmlCopyNode(acts, 1);
+		all_ccts = xmlCopyNode(ccts, 1);
+		/* Find the ACT/CCT referenced by the current DM. */
+		find_cross_ref_tables(doc, all_acts, all_ccts);
+	} else {
+		/* Only use the user-defined ACTs/CCTs. */
+		all_acts = acts;
+		all_ccts = ccts;
 	}
 
 	if (process) {
@@ -518,16 +513,16 @@ void processFile(const char *in, const char *out, bool xincl, bool process,
 	}
 
 	if (genDispText) {
-		generateDisplayText(doc, acts, ccts);
+		generateDisplayText(doc, all_acts, all_ccts);
 	}
 
 	xmlSaveFile(out, doc);
 
 	/* The next data module could reference a different ACT/CCT, so
 	 * the list must be cleared. */
 	if (findcts) {
-		clear_ct(acts);
-		clear_ct(ccts);
+		xmlFreeNode(all_acts);
+		xmlFreeNode(all_ccts);
 	}
 
 	xmlFreeDoc(doc);
@@ -541,7 +536,7 @@ void showHelp(void)
 	puts("  -A <ACT>   Use <ACT> when generating display text.");
 	puts("  -a <ID>    Use <ID> for DM-level applic.");
 	puts("  -C <CCT>   Use <CCT> when generating display text.");
-	puts("  -c         Ignore ACT/CCT refs.");
+	puts("  -c         Search for ACT/CCT data modules.");
 	puts("  -d         Dump built-in XSLT for generating display text.");
 	puts("  -f         Overwrite input file(s).");
 	puts("  -G <XSL>   Use custom XSLT script to generate display text.");
@@ -563,7 +558,7 @@ int main(int argc, char **argv)
 	bool xincl = false;
 	bool genDispText = false;
 	bool process = false;
-	bool findcts = true;
+	bool findcts = false;
 
 	xmlNodePtr acts, ccts;
 
@@ -604,7 +599,7 @@ int main(int argc, char **argv)
 				findcts = false;
 				break;
 			case 'c':
-				findcts = false;
+				findcts = true;
 				break;
 			case 'd':
 				dumpGenDispTextXsl();