Commit ccadfa1
committed
Shared: Update the model generator script to allow execution of the mixed model generator queries.
1 parent 8310faa commit ccadfa1
1 file changed
Lines changed: 34 additions & 12 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -33,7 +33,8 @@ def __init__ (self, language): | |||
| 33 | 33 | self.generateSources = False | |
| 34 | 34 | self.generateSummaries = False | |
| 35 | 35 | self.generateNeutrals = False | |
| 36 | - self.generateContentSummaries = False | ||
| 36 | + self.generateMixedSummaries = False | ||
| 37 | + self.generateMixedNeutrals = False | ||
| 37 | 38 | self.generateTypeBasedSummaries = False | |
| 38 | 39 | self.dryRun = False | |
| 39 | 40 | self.dirname = "modelgenerator" | |
@@ -51,7 +52,8 @@ def printHelp(self): | |||
| 51 | 52 | --with-sources | |
| 52 | 53 | --with-summaries | |
| 53 | 54 | --with-neutrals | |
| 54 | - --with-content-summaries (Experimental). May not be used in conjunction with --with-summaries | ||
| 55 | + --with-mixed-summaries (Experimental). May not be used in conjunction with --with-summaries. | ||
| 56 | + --with-mixed-neutrals (Experimental). Should only be used in conjunction with --with-mixed-summaries. | ||
| 55 | 57 | --with-typebased-summaries (Experimental) | |
| 56 | 58 | If none of these flags are specified, all models are generated except for the type based models. | |
| 57 | 59 | ||
@@ -83,7 +85,7 @@ def make(language): | |||
| 83 | 85 | generator.printHelp() | |
| 84 | 86 | sys.exit(0) | |
| 85 | 87 | ||
| 86 | - if "--with-summaries" in sys.argv and "--with-content-summaries" in sys.argv: | ||
| 88 | + if "--with-summaries" in sys.argv and "--with-mixed-summaries" in sys.argv: | ||
| 87 | 89 | generator.printHelp() | |
| 88 | 90 | sys.exit(0) | |
| 89 | 91 | ||
@@ -103,9 +105,13 @@ def make(language): | |||
| 103 | 105 | sys.argv.remove("--with-neutrals") | |
| 104 | 106 | generator.generateNeutrals = True | |
| 105 | 107 | ||
| 106 | - if "--with-content-summaries" in sys.argv: | ||
| 107 | - sys.argv.remove("--with-content-summaries") | ||
| 108 | - generator.generateContentSummaries = True | ||
| 108 | + if "--with-mixed-summaries" in sys.argv: | ||
| 109 | + sys.argv.remove("--with-mixed-summaries") | ||
| 110 | + generator.generateMixedSummaries = True | ||
| 111 | + | ||
| 112 | + if "--with-mixed-neutrals" in sys.argv: | ||
| 113 | + sys.argv.remove("--with-mixed-neutrals") | ||
| 114 | + generator.generateMixedNeutrals = True | ||
| 109 | 115 | ||
| 110 | 116 | if "--with-typebased-summaries" in sys.argv: | |
| 111 | 117 | sys.argv.remove("--with-typebased-summaries") | |
@@ -115,7 +121,13 @@ def make(language): | |||
| 115 | 121 | sys.argv.remove("--dry-run") | |
| 116 | 122 | generator.dryRun = True | |
| 117 | 123 | ||
| 118 | - if not generator.generateSinks and not generator.generateSources and not generator.generateSummaries and not generator.generateNeutrals and not generator.generateTypeBasedSummaries and not generator.generateContentSummaries: | ||
| 124 | + if (not generator.generateSinks and | ||
| 125 | + not generator.generateSources and | ||
| 126 | + not generator.generateSummaries and | ||
| 127 | + not generator.generateNeutrals and | ||
| 128 | + not generator.generateTypeBasedSummaries and | ||
| 129 | + not generator.generateMixedSummaries and | ||
| 130 | + not generator.generateMixedNeutrals): | ||
| 119 | 131 | generator.generateSinks = generator.generateSources = generator.generateSummaries = generator.generateNeutrals = True | |
| 120 | 132 | ||
| 121 | 133 | n = len(sys.argv) | |
@@ -173,12 +185,17 @@ def makeContent(self): | |||
| 173 | 185 | else: | |
| 174 | 186 | neutralAddsTo = { } | |
| 175 | 187 | ||
| 176 | - if self.generateContentSummaries: | ||
| 177 | - contentSummaryAddsTo = self.getAddsTo("CaptureContentSummaryModels.ql", helpers.summaryModelPredicate) | ||
| 188 | + if self.generateMixedSummaries: | ||
| 189 | + mixedSummaryAddsTo = self.getAddsTo("CaptureMixedSummaryModels.ql", helpers.summaryModelPredicate) | ||
| 190 | + else: | ||
| 191 | + mixedSummaryAddsTo = { } | ||
| 192 | + | ||
| 193 | + if self.generateMixedNeutrals: | ||
| 194 | + mixedNeutralAddsTo = self.getAddsTo("CaptureMixedNeutralModels.ql", helpers.neutralModelPredicate) | ||
| 178 | 195 | else: | |
| 179 | - contentSummaryAddsTo = { } | ||
| 196 | + mixedNeutralAddsTo = { } | ||
| 180 | 197 | ||
| 181 | - return helpers.merge(summaryAddsTo, contentSummaryAddsTo, sinkAddsTo, sourceAddsTo, neutralAddsTo) | ||
| 198 | + return helpers.merge(summaryAddsTo, mixedSummaryAddsTo, sinkAddsTo, sourceAddsTo, neutralAddsTo, mixedNeutralAddsTo) | ||
| 182 | 199 | ||
| 183 | 200 | def makeTypeBasedContent(self): | |
| 184 | 201 | if self.generateTypeBasedSummaries: | |
@@ -208,7 +225,12 @@ def run(self): | |||
| 208 | 225 | print("Models as data extensions generated, but not written to file.") | |
| 209 | 226 | sys.exit(0) | |
| 210 | 227 | ||
| 211 | - if self.generateSinks or self.generateSources or self.generateSummaries or self.generateNeutrals: | ||
| 228 | + if (self.generateSinks or | ||
| 229 | + self.generateSources or | ||
| 230 | + self.generateSummaries or | ||
| 231 | + self.generateNeutrals or | ||
| 232 | + self.generateMixedSummaries or | ||
| 233 | + self.generatedMixedNeutrals): | ||
| 212 | 234 | self.save(content, ".model.yml") | |
| 213 | 235 | ||
| 214 | 236 | if self.generateTypeBasedSummaries: | |
0 commit comments