Menu
▾
▴
mp-plugins-svn
|
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.
|
|
From: <nor...@us...> - 2007-06-24 15:51:39
|
Revision: 623
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=623&view=rev
Author: northern_sky
Date: 2007-06-24 08:51:37 -0700 (Sun, 24 Jun 2007)
Log Message:
-----------
fixed a bug with filepath.- there's probaly more old stuff that can be removed now
Modified Paths:
--------------
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ProgramViewHandler.cs
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ProgramViewHandler.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ProgramViewHandler.cs 2007-06-24 15:50:44 UTC (rev 622)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ProgramViewHandler.cs 2007-06-24 15:51:37 UTC (rev 623)
@@ -319,10 +319,11 @@
sqlSelect.AddField("tblFileItem.*");
sqlSelect.AddField("'' as title2");
sqlSelect.AddField("'' as fieldtype2");
- if (pathSubfolders != "")
+ /* if (pathSubfolders != "")
{
sqlSelect.AddWhereCond(String.Format("filepath = '{0}'", pathSubfolders));
- }
+ }*/
+
sqlSelect.AddOrderField("isfolder desc");
sqlSelect.AddOrderField("uppertitle");
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <che...@us...> - 2007-06-24 16:28:17
|
Revision: 625
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=625&view=rev
Author: chef_koch
Date: 2007-06-24 09:28:13 -0700 (Sun, 24 Jun 2007)
Log Message:
-----------
added restriction to MostRecentlyLaunched filter
Modified Paths:
--------------
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ProgramViewHandler.cs
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ProgramViewHandler.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ProgramViewHandler.cs 2007-06-24 16:20:49 UTC (rev 624)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ProgramViewHandler.cs 2007-06-24 16:28:13 UTC (rev 625)
@@ -72,7 +72,7 @@
//manufacturer
ViewDefinition viewManufacturer = new ViewDefinition();
- viewManufacturer.Name = "13031";
+ viewManufacturer.Name = "13031"; // Manufacturer
filter1 = new FilterDefinition(); filter1.Where = "manufacturer"; ; filter1.SortAscending = true;
filter2 = new FilterDefinition(); filter2.Where = "filename"; ; filter2.SortAscending = true;
viewManufacturer.Filters.Add(filter1);
@@ -80,7 +80,7 @@
//Alphabetical
ViewDefinition viewAlphabetical = new ViewDefinition();
- viewAlphabetical.Name = "13034";
+ viewAlphabetical.Name = "13034"; // Alphabetical / All Games
filter1 = new FilterDefinition();
filter1.Where = "title";
filter1.SqlOperator = "group by";
@@ -94,7 +94,7 @@
//genre
ViewDefinition viewGenre = new ViewDefinition();
- viewGenre.Name = "135";
+ viewGenre.Name = "135"; // Genre
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;
@@ -105,7 +105,7 @@
//rating
ViewDefinition viewRating = new ViewDefinition();
- viewRating.Name = "931";
+ viewRating.Name = "931"; // Rating
filter1 = new FilterDefinition(); filter1.Where = "rating"; ; filter1.SortAscending = false;
filter2 = new FilterDefinition(); filter2.Where = "filename"; ; filter2.SortAscending = true;
viewRating.Filters.Add(filter1);
@@ -113,7 +113,7 @@
//year
ViewDefinition viewYear = new ViewDefinition();
- viewYear.Name = "987";
+ viewYear.Name = "987"; // Year
filter1 = new FilterDefinition(); filter1.Where = "year"; ; filter1.SortAscending = true;
filter2 = new FilterDefinition(); filter2.Where = "filename"; ; filter2.SortAscending = true;
viewYear.Filters.Add(filter1);
@@ -121,14 +121,14 @@
//most launched
ViewDefinition viewMostLaunched = new ViewDefinition();
- viewMostLaunched.Name = "13032";
+ viewMostLaunched.Name = "13032"; // LaunchCount
filter1 = new FilterDefinition(); filter1.Where = "launchcount"; filter1.SqlOperator = ">"; filter1.Restriction = "0"; filter1.SortAscending = false;
viewMostLaunched.Filters.Add(filter1);
//most recently launched
ViewDefinition viewMostRecentlyLaunched = new ViewDefinition();
- viewMostRecentlyLaunched.Name = "13033";
- filter1 = new FilterDefinition(); filter1.Where = "lastTimeLaunched"; ; filter1.SortAscending = false;
+ viewMostRecentlyLaunched.Name = "13033"; // Most Recently Launched
+ filter1 = new FilterDefinition(); filter1.Where = "lastTimeLaunched"; filter1.SqlOperator = ">"; filter1.Restriction = DateTime.MinValue.ToString(); filter1.SortAscending = false;
filter1.Limit = 100;
viewMostRecentlyLaunched.Filters.Add(filter1);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <nor...@us...> - 2007-07-03 20:43:08
|
Revision: 670
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=670&view=rev
Author: northern_sky
Date: 2007-07-03 13:43:01 -0700 (Tue, 03 Jul 2007)
Log Message:
-----------
some redundant stuff removed
Modified Paths:
--------------
trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ProgramViewHandler.cs
Modified: trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ProgramViewHandler.cs
===================================================================
--- trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ProgramViewHandler.cs 2007-07-03 17:14:59 UTC (rev 669)
+++ trunk/plugins/myGUIProgramsAlt/GUIProgramsAlt/ProgramViewHandler.cs 2007-07-03 20:43:01 UTC (rev 670)
@@ -60,6 +60,7 @@
public ProgramViewHandler()
{
+ #region create default filter
//create default views if file not exist
if (!System.IO.File.Exists(defaultProgramViews))
{
@@ -147,6 +148,7 @@
fileStream.Close();
}
}
+ #endregion create default filter
if (!File.Exists(customProgramViews))
{
@@ -280,7 +282,7 @@
{
bool res = false;
FilterDefinition definition = (FilterDefinition)currentView.Filters[CurrentLevel];
- definition.SelectedValue = GetFieldValue(filterItem, definition.Where);
+ definition.SelectedValue = filterItem.Title;
if (currentLevel + 1 < currentView.Filters.Count)
{
currentLevel++;
@@ -463,7 +465,7 @@
void BuildFilter(FilterDefinition filter, SQLSelectBuilder sqlSelect,int appId)
{
- sqlSelect.AddWhereCond(String.Format(" {0}='{1}'", GetFieldId(filter.Where), ProgramUtils.Encode(filter.SelectedValue)));
+ sqlSelect.AddWhereCond(String.Format(" {0}='{1}'", GetField(filter.Where), ProgramUtils.Encode(filter.SelectedValue)));
}
@@ -493,7 +495,7 @@
filter.SqlOperator = "like";
}
}
- whereClause = String.Format(" {0} {1} '{2}'", GetFieldName(filter.Where), filter.SqlOperator, restriction);
+ whereClause = String.Format(" {0} {1} '{2}'", GetField(filter.Where), filter.SqlOperator, restriction);
sqlSelect.AddWhereCond(whereClause);
}
}
@@ -536,14 +538,7 @@
void BuildOrder(FilterDefinition filter, SQLSelectBuilder sqlSelect)
{
string orderClause = GetField(filter.Where);
- if (orderClause == "mainGenre")
- {
- orderClause = "tblMainGenre.genre";
- }
- else if(orderClause == "subGenre") {
- orderClause = "tblSubGenre.genre";
- }
if (orderClause != "")
{
if (!filter.SortAscending) orderClause += " desc";
@@ -560,8 +555,8 @@
{
if (where == "title") return "title";
if (where == "mainGenreId") return "mainGenreId";
- if (where == "mainGenre") return "mainGenre";
- if (where == "subGenre") return "subGenre";
+ if (where == "mainGenre") return "tblMainGenre.genre";
+ if (where == "subGenre") return "tblSubGenre.genre";
if (where == "subGenreId") return "subGenreId";
if (where == "country") return "country";
if (where == "manufacturer") return "manufacturer";
@@ -573,43 +568,6 @@
return "";
}
- string GetFieldId(string where)
- {
- if (where == "title") return "title";
- if (where == "mainGenreId") return "mainGenreId";
- if (where == "subGenreId") return "subGenreId";
- if (where == "mainGenre") return "tblMainGenre.Genre";
- if (where == "subGenre") return "tblSubGenre.Genre";
- if (where == "country") return "country";
- if (where == "manufacturer") return "manufacturer";
- if (where == "manufacturerId") return "manufacturerId";
- if (where == "year") return "year";
- if (where == "rating") return "rating";
- if (where == "launchcount") return "launchcount";
- if (where == "lastTimeLaunched") return "lastTimeLaunched";
- return "";
- }
-
- string GetFieldName(string where)
- {
- // yeah, that's great code :-)
- // maps WHERE-fieldname to a SQL-fieldname
- // and the MAY be different in the future.....
- if (where == "title") return "title";
- else if (where == "mainGenreId") return "mainGenreId";
- else if (where == "subGenre") return "tblSubGenre.genre";
- else if (where == "subGenreId") return "subGenreId";
- else if (where == "mainGenre") return "tblMainGenre.genre";
- else if (where == "manufacturer") return "manufacturer";
- else if (where == "manufacturerId") return "manufacturerId";
- else if (where == "country") return "country";
- else if (where == "year") return "year";
- else if (where == "rating") return "rating";
- else if (where == "launchcount") return "launchcount";
- else if (where == "lastTimeLaunched") return "lastTimeLaunched";
- else return "";
- }
-
string GetFieldNameForSelect(string where)
{
string res = "";
@@ -623,7 +581,7 @@
}
else
{
- res = GetFieldName(where);
+ res = GetField(where);
if (res == "")
{
res = "tblFileItem.*";
@@ -674,7 +632,6 @@
else if (where == "country") return "'STR' as fieldtype";
else if (where == "year") return "'INT' as fieldtype";
else if (where == "rating") return "'INT' as fieldtype";
- // else if (where == "launchcount") return "'INT'";
else if (where == "launchcount") return "'STR' as fieldtype";
else if (where == "lastTimeLaunched") return "'STR' as fieldtype";
else return "'STR' as fieldtype";
@@ -687,6 +644,11 @@
else return "'' as fieldtype2";
}
+ /// <summary>
+ /// Should the query be distinct...
+ /// </summary>
+ /// <param name="where"></param>
+ /// <returns></returns>
bool GetDistinct(string where)
{
if (where == "title") return false;
@@ -701,43 +663,5 @@
else if (where == "lastTimeLaunched") return false;
else return false;
}
-
- string GetFieldValue(ProgramFilterItem filterItem, string where)
- {
- return filterItem.Title;
- /*
- * if (where == "title") return filterItem.Title;
- else if (where == "genre") return filterItem.Genre;
- else if (where == "manufacturer") return filterItem.Manufacturer;
- else if (where == "country") return filterItem.Country;
- else if (where == "year") return ((int) filterItem.Year).ToString();
- else if (where == "rating") return ((int) filterItem.Rating).ToString();
- else return "";
- */
- }
-
- public void SetLabel(ProgramFilterItem filterItem, ref GUIListItem guiListItem)
- {
- if (filterItem == null) return;
- FilterDefinition definition = (FilterDefinition)currentView.Filters[CurrentLevel];
- if ((definition.Where == "mainGenreId") || (definition.Where == "subGenre"))
- {
- guiListItem.Label = filterItem.Genre;
- guiListItem.Label2 = String.Empty;
- guiListItem.Label3 = String.Empty;
- }
- if (definition.Where == "year")
- {
- guiListItem.Label = (filterItem.Year).ToString();
- guiListItem.Label2 = String.Empty;
- guiListItem.Label3 = String.Empty;
- }
- else
- {
- guiListItem.Label = filterItem.Title;
- guiListItem.Label2 = String.Empty;
- guiListItem.Label3 = String.Empty;
- }
- }
}
}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X