Merge branch 'master' of github.com:ecu-sle-lab/mysql-query-construction-analysis

Author: mahills

QCPAnalysis/src/QCPAnalysis/QCP4SubcaseAnalysis.rsc

@@ -50,10 +50,10 @@ public void analyzeQCP4(){
 		}
 		sublist += p.dynamicpart@at;
 	}
-	for(q <- sublist) println(q.dynamicpart@at);*/ 
+	for(q <- sublist) println(q);*/
 
 	// for validation of column, table, and database name grouping
-	for(q <- groupDynamicSnippetsByRole(qcp4)["Column, Table, or Database Name"]) println(q.dynamicpart@at);
+	//for(q <- groupDynamicSnippetsByRole(qcp4)["Column, Table, or Database Name"]) println(q.dynamicpart@at);
 
 	// for validation of other grouping
 	//for(q <- groupDynamicSnippetsByRole(qcp4)["Column, Table, or Database Name"]) println(q.dynamicpart@at);

QCPAnalysis/src/QCPAnalysis/QueryStringAnalysis.rsc

@@ -31,8 +31,6 @@ import List;
 
 loc cfglocb = |project://QCPAnalysis/cfgs/binary|;
 loc cfglocp = |project://QCPAnalysis/cfgs/plain|;
-
-// See the Wiki of this GitHub Repository for more detailed information on pattern classifications
 
 // represents a Query string (parameter to a mysql_query call)
 data QueryString = querystring(loc callloc, list[QuerySnippet] snippets, PatternFlags flags);
@@ -196,7 +194,7 @@ public set[QueryString] getQCP(str id){
 }
 public set[loc] getQCPLocs(str id) = {q.callloc | q <- getQCP(id)};
 
-// builds and classifies all query strings based on the Query Construction Patterns in the wiki
+// builds and classifies all query strings based on the Query Construction Patterns
 public set[QueryString] buildAndClassifyQueryStrings(){
 	Corpus corpus = getCorpus();
 	set[QueryString] corpusres = {};
@@ -347,7 +345,8 @@ public set[QueryString] buildAndClassifyQueryStrings(){
 				qs.flags.unclassified = false;
 				qs.flags.qcp4 = true;
 			}
-			else{
+			
+			else if(call(_,[actualParameter(scalar(string(_)),false),_*]) !:= c){
 				println("unclassified query found at <qs.callloc>");
 			}
 			sysres += qs;

QCPAnalysis/src/QCPAnalysis/WriteResults.rsc

@@ -81,7 +81,7 @@ public str qcp4RolesAsLatexTable(set[QueryString] qs){
 	'\\npfourdigitsep
 	'\\begin{table}
 	'\\centering
-	'\\caption{Counts of Each QCP4 Dynamic Part Grouped by Role\\label{qcp4-roles}}
+	'\\caption{Counts of Each QCP4 Dynamic Part Grouped by Role\\label{tbl:qcp4-roles}}
 	'\\ra{1.2}
 	'\\begin{tabularx}{\\columnwidth}{Xrrr} \\toprule
 	'Role & Number of Occurrences\\\\ \\midrule