13 | | {{{ |
14 | | --- upnpcds.cpp 2008-01-19 17:13:47.000000000 -0700 |
15 | | +++ ../upnpcds.cpp 2008-01-19 18:46:54.000000000 -0700 |
16 | | @@ -1210,7 +1210,6 @@ |
17 | | if (query.isConnected()) |
18 | | { |
19 | | QString sWhere( "" ); |
20 | | - QString sOrder( "" ); |
21 | | |
22 | | if ( sKey.length() > 0) |
23 | | { |
24 | | @@ -1218,13 +1217,6 @@ |
25 | | .arg( pInfo->column ); |
26 | | } |
27 | | |
28 | | - |
29 | | - QString orderColumn( pInfo->orderColumn ); |
30 | | - if (orderColumn.length() != 0) { |
31 | | - sOrder = QString( "ORDER BY %1 " ) |
32 | | - .arg( orderColumn ); |
33 | | - } |
34 | | - |
35 | | if (pRequest->m_sObjectId.startsWith("Videos", true)) |
36 | | { |
37 | | if (pRequest->m_sParentId != "") |
38 | | @@ -1263,7 +1255,7 @@ |
39 | | |
40 | | QString sSQL = QString( "%1 %2 LIMIT %3, %4" ) |
41 | | .arg( GetItemListSQL( pInfo->column ) ) |
42 | | - .arg( sWhere + ParentClause + sOrder ) |
43 | | + .arg( sWhere + ParentClause ) |
44 | | .arg( pRequest->m_nStartingIndex ) |
45 | | .arg( pRequest->m_nRequestedCount ); |
46 | | |
47 | | --- upnpcds.h 2008-01-18 16:54:15.000000000 -0700 |
48 | | +++ ../upnpcds.h 2008-01-19 18:46:54.000000000 -0700 |
49 | | @@ -111,7 +111,6 @@ |
50 | | char *column; |
51 | | char *sql; |
52 | | char *where; |
53 | | - char *orderColumn; |
54 | | |
55 | | } UPnpCDSRootInfo; |
56 | | |
57 | | |
58 | | |
59 | | --- upnpcdsmusic.cpp 2008-01-18 16:57:19.000000000 -0700 |
60 | | +++ ../upnpcdsmusic.cpp 2008-01-19 18:46:54.000000000 -0700 |
61 | | @@ -50,7 +50,7 @@ |
62 | | "FROM music_songs song " |
63 | | "%1 " |
64 | | "ORDER BY name", |
65 | | - "", "" }, |
66 | | + "" }, |
67 | | |
68 | | /* |
69 | | This is currently broken... need to handle list of items with single parent |
70 | | (like 'All Music') |
71 | | @@ -74,7 +74,7 @@ |
72 | | "%1 " |
73 | | "GROUP BY a.album_id " |
74 | | "ORDER BY a.album_name", |
75 | | - "WHERE song.album_id=:KEY","" }, |
76 | | + "WHERE song.album_id=:KEY" }, |
77 | | /* |
78 | | |
79 | | { "By Artist", |
80 | | --- upnpcdstv.cpp 2008-01-18 16:58:54.000000000 -0700 |
81 | | +++ ../upnpcdstv.cpp 2008-01-19 18:46:54.000000000 -0700 |
82 | | @@ -44,7 +44,7 @@ |
83 | | "FROM recorded " |
84 | | "%1 " |
85 | | "ORDER BY starttime DESC", |
86 | | - "", "" }, |
87 | | + "" }, |
88 | | |
89 | | { "By Title", |
90 | | "title", |
91 | | @@ -55,7 +55,7 @@ |
92 | | "%1 " |
93 | | "GROUP BY title " |
94 | | "ORDER BY title", |
95 | | - "WHERE title=:KEY", "" }, |
96 | | + "WHERE title=:KEY" }, |
97 | | |
98 | | { "By Genre", |
99 | | "category", |
100 | | @@ -66,7 +66,7 @@ |
101 | | "%1 " |
102 | | "GROUP BY category " |
103 | | "ORDER BY category", |
104 | | - "WHERE category=:KEY", "" }, |
105 | | + "WHERE category=:KEY" }, |
106 | | |
107 | | { "By Date", |
108 | | "DATE_FORMAT(starttime, '%Y-%m-%d')", |
109 | | @@ -77,7 +77,7 @@ |
110 | | "%1 " |
111 | | "GROUP BY name " |
112 | | "ORDER BY starttime DESC", |
113 | | - "WHERE DATE_FORMAT(starttime, '%Y-%m-%d') =:KEY", "" }, |
114 | | + "WHERE DATE_FORMAT(starttime, '%Y-%m-%d') =:KEY" }, |
115 | | |
116 | | { "By Channel", |
117 | | "chanid", |
118 | | @@ -89,7 +89,7 @@ |
119 | | "%1 " |
120 | | "GROUP BY name " |
121 | | "ORDER BY channel.chanid", |
122 | | - "WHERE channel.chanid=:KEY", "" }, |
123 | | + "WHERE channel.chanid=:KEY" }, |
124 | | |
125 | | |
126 | | { "By Group", |
127 | | @@ -100,7 +100,7 @@ |
128 | | "%1 " |
129 | | "GROUP BY recgroup " |
130 | | "ORDER BY recgroup", |
131 | | - "WHERE recgroup=:KEY", "" } |
132 | | + "WHERE recgroup=:KEY" } |
133 | | }; |
134 | | |
135 | | int UPnpCDSTv::g_nRootCount = sizeof( g_RootNodes ) / sizeof( |
136 | | UPnpCDSRootInfo ); |
137 | | --- upnpcdsvideo.cpp 2008-01-18 16:57:50.000000000 -0700 |
138 | | +++ ../upnpcdsvideo.cpp 2008-01-19 18:46:54.000000000 -0700 |
139 | | @@ -22,8 +22,8 @@ |
140 | | "1 as children " |
141 | | "FROM upnpmedia " |
142 | | "%1 " |
143 | | - "ORDER BY title ASC", |
144 | | - "", "title" } |
145 | | + "ORDER BY title DESC", |
146 | | + "" } |
147 | | |
148 | | }; |
149 | | }}} |