From: <nor...@us...> - 2007-06-11 19:35:51
|
Revision: 513 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=513&view=rev Author: northern_sky Date: 2007-06-11 12:35:49 -0700 (Mon, 11 Jun 2007) Log Message: ----------- restored changed dbquerys,views,fileload working again Modified Paths: -------------- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ProgramViewHandler.cs Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ProgramViewHandler.cs =================================================================== --- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ProgramViewHandler.cs 2007-06-10 21:40:37 UTC (rev 512) +++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ProgramViewHandler.cs 2007-06-11 19:35:49 UTC (rev 513) @@ -95,8 +95,8 @@ //genre ViewDefinition viewGenre = new ViewDefinition(); viewGenre.Name = "Genre"; - filter1 = new FilterDefinition(); filter1.Where = "genre"; ; filter1.SortAscending = true; - filter2 = new FilterDefinition(); filter2.Where = "genre2"; ; filter2.SortAscending = true; + filter1 = new FilterDefinition(); filter1.Where = "mainGenre"; ; filter1.SortAscending = true; + filter2 = new FilterDefinition(); filter2.Where = "subGenre"; ; filter2.SortAscending = true; filter3 = new FilterDefinition(); filter3.Where = "filename"; ; filter3.SortAscending = true; viewGenre.Filters.Add(filter1); viewGenre.Filters.Add(filter2); @@ -307,7 +307,7 @@ SQLSelectBuilder sqlSelect = new SQLSelectBuilder(); // build the SQL query respecting all the filters and let // the query be executed from outside (this is different from MusicViewHandler) - sqlSelect.AddTable("tblfile"); + sqlSelect.AddTable("tblFileItem"); sqlSelect.AddWhereCond(String.Format("appid = {0}", appID)); if (currentView == null) { @@ -316,7 +316,7 @@ // a: "select file.*, '' as title2, '' as fieldtype2 from file where appid = {0} order by isfolder desc, uppertitle" // b: "select file.*, '' as title2, '' as fieldtype2 from file where appid = {0} and filepath = '{1}' order by isfolder desc, uppertitle" - sqlSelect.AddField("tblfile.*"); + sqlSelect.AddField("tblFileItem.*"); sqlSelect.AddField("'' as title2"); sqlSelect.AddField("'' as fieldtype2"); if (pathSubfolders != "") @@ -364,7 +364,7 @@ { return @"SELECT UPPER(SUBSTR(" + currentViewFilterFieldVariable + ",1," + currentViewFilterFieldRestriction + @")) AS title, - COUNT(*) FROM tblfile WHERE appid = " + appID + @" + COUNT(*) FROM tblFileItem WHERE appid = " + appID + @" GROUP BY UPPER(SUBSTR(title,1," + currentViewFilterFieldRestriction + @")) @@ -395,7 +395,7 @@ UPPER(SUBSTR(" + currentViewFilterFieldVariable + ",1," + currentViewFilterFieldRestriction + @")) AS title, Count(*) - FROM tblfile + FROM tblFileItem WHERE appid = " + appID + @" @@ -406,7 +406,7 @@ UPPER(SUBSTR(" + prevViewFilterFieldVariable + ",1," + prevViewFilterRestriciton + @")) AS title FROM - tblfile + tblFileItem WHERE appid = " + appID + @" @@ -427,11 +427,11 @@ else { return @"SELECT - tblfile.*, + tblFileItem.*, 'STR' AS fieldtype FROM - tblfile + tblFileItem WHERE UPPER(SUBSTR(" + prevViewFilterFieldVariable + ",1," + prevViewFilterRestriciton + @")) LIKE '" + prevViewFilterFieldSelectedValue + @"%' @@ -541,11 +541,8 @@ string GetField(string where) { if (where == "title") return "title"; - if (where == "genre") return "genre"; - if (where == "genre2") return "genre2"; - if (where == "genre3") return "genre3"; - if (where == "genre4") return "genre4"; - if (where == "genre5") return "genre5"; + if (where == "mainGenre") return "mainGenre"; + if (where == "subGenre") return "subGenre"; if (where == "country") return "country"; if (where == "manufacturer") return "manufacturer"; if (where == "year") return "year"; @@ -558,11 +555,8 @@ string GetFieldId(string where) { if (where == "title") return "title"; - if (where == "genre") return "genre"; - if (where == "genre2") return "genre2"; - if (where == "genre3") return "genre3"; - if (where == "genre4") return "genre4"; - if (where == "genre5") return "genre5"; + if (where == "mainGenre") return "mainGenre"; + if (where == "subGenre") return "subGenre"; if (where == "country") return "country"; if (where == "manufacturer") return "manufacturer"; if (where == "year") return "year"; @@ -578,11 +572,8 @@ // maps WHERE-fieldname to a SQL-fieldname // and the MAY be different in the future..... if (where == "title") return "title"; - else if (where == "genre") return "genre"; - else if (where == "genre2") return "genre2"; - else if (where == "genre3") return "genre3"; - else if (where == "genre4") return "genre4"; - else if (where == "genre5") return "genre5"; + else if (where == "mainGenre") return "mainGenre"; + else if (where == "subGenre") return "subGenre"; else if (where == "manufacturer") return "manufacturer"; else if (where == "country") return "country"; else if (where == "year") return "year"; @@ -597,18 +588,18 @@ string res = ""; if (where == "launchcount") { - res = "tblfile.*"; + res = "tblFileItem.*"; } else if (where == "lastTimeLaunched") { - res = "tblfile.*"; + res = "tblFileItem.*"; } else { res = GetFieldName(where); if (res == "") { - res = "tblfile.*"; + res = "tblFileItem.*"; } else { @@ -639,11 +630,8 @@ string GetFieldTypeForSelect(string where) { if (where == "title") return "'STR' as fieldtype"; // watch quotes... these are SQL-strings! - else if (where == "genre") return "'STR' as fieldtype"; - else if (where == "genre2") return "'STR' as fieldtype"; - else if (where == "genre3") return "'STR' as fieldtype"; - else if (where == "genre4") return "'STR' as fieldtype"; - else if (where == "genre5") return "'STR' as fieldtype"; + else if (where == "mainGenre") return "'STR' as fieldtype"; + else if (where == "subGenre") return "'STR' as fieldtype"; else if (where == "manufacturer") return "'STR' as fieldtype"; else if (where == "country") return "'STR' as fieldtype"; else if (where == "year") return "'INT' as fieldtype"; @@ -664,11 +652,8 @@ bool GetDistinct(string where) { if (where == "title") return false; - else if (where == "genre") return true; - else if (where == "genre2") return true; - else if (where == "genre3") return true; - else if (where == "genre4") return true; - else if (where == "genre5") return true; + else if (where == "mainGenre") return true; + else if (where == "subGenre") return true; else if (where == "manufacturer") return true; else if (where == "country") return true; else if (where == "year") return true; @@ -696,7 +681,7 @@ { if (filterItem == null) return; FilterDefinition definition = (FilterDefinition)currentView.Filters[CurrentLevel]; - if ((definition.Where == "genre") || (definition.Where == "genre2") || (definition.Where == "genre3") || (definition.Where == "genre4") || (definition.Where == "genre5")) + if ((definition.Where == "mainGenre") || (definition.Where == "subGenre")) { guiListItem.Label = filterItem.Genre; guiListItem.Label2 = String.Empty; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |