Xibo

Merge lp:~dangarner/xibo/client-121 into lp:xibo/1.2

  1. client-121
  2. Merge into biela
Proposed by Dan Garner
Status: Merged
Merged at revision: 203
Proposed branch: lp:~dangarner/xibo/client-121
Merge into: lp:xibo/1.2
Diff against target: 468 lines (+88/-69)
12 files modified
client/dotNET/FileCollector.cs (+9/-1)
client/dotNET/MainForm.cs (+43/-40)
client/dotNET/Properties/Settings.Designer.cs (+1/-1)
client/dotNET/Properties/Settings.settings (+1/-1)
client/dotNET/Region.cs (+8/-0)
client/dotNET/RssReader.cs (+1/-1)
client/dotNET/Web References/xmds/Reference.cs (+19/-19)
client/dotNET/Web References/xmds/Reference.map (+1/-1)
client/dotNET/Web References/xmds/xmds.wsdl (+1/-1)
client/dotNET/XiboClient.csproj (+2/-2)
client/dotNET/app.config (+1/-1)
server/lib/service/xmdssoap.class.php (+1/-1)
To merge this branch: bzr merge lp:~dangarner/xibo/client-121
Reviewer Review Type Date Requested Status
Xibo Maintainters Pending
Review via email: mp+48806@code.launchpad.net
To post a comment you must log in.
lp:~dangarner/xibo/client-121 updated
199. By Dan Garner

[server] Ordered required files by the record type DESC

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'client/dotNET/FileCollector.cs'
2--- client/dotNET/FileCollector.cs 2010-04-19 21:45:10 +0000
3+++ client/dotNET/FileCollector.cs 2011-02-07 16:44:44 +0000
4@@ -234,7 +234,15 @@
5 }
6 }
7
8- System.Diagnostics.Debug.WriteLine(String.Format("There are {0} files to get", files.Count.ToString()));
9+ Debug.WriteLine(String.Format("There are {0} files to get", files.Count.ToString()));
10+
11+ // Output a list of the files we need to get
12+ string debugMessage = "";
13+
14+ foreach (FileList fileToGet in files)
15+ debugMessage += string.Format("File: {0}, Type: {1}, MD5: {2}. ", fileToGet.path, fileToGet.type, fileToGet.md5);
16+
17+ Debug.WriteLine(debugMessage);
18
19 // Is there anything to get?
20 if (files.Count == 0)
21
22=== modified file 'client/dotNET/MainForm.cs'
23--- client/dotNET/MainForm.cs 2010-08-26 20:15:36 +0000
24+++ client/dotNET/MainForm.cs 2011-02-07 16:44:44 +0000
25@@ -191,9 +191,29 @@
26 {
27 Debug.WriteLine(ex.Message);
28 _isExpired = true;
29+
30+ ShowSplashScreen();
31+
32+ // In 10 seconds fire the next layout?
33+ Timer timer = new Timer();
34+ timer.Interval = 10000;
35+ timer.Tick += new EventHandler(splashScreenTimer_Tick);
36+
37+ // Start the timer
38+ timer.Start();
39 }
40 }
41
42+ void splashScreenTimer_Tick(object sender, EventArgs e)
43+ {
44+ Debug.WriteLine(new LogMessage("timer_Tick", "Loading next layout after splashscreen"));
45+
46+ Timer timer = (Timer)sender;
47+ timer.Stop();
48+ timer.Dispose();
49+
50+ _schedule.NextLayout();
51+ }
52
53 /// <summary>
54 /// Prepares the Layout.. rendering all the necessary controls
55@@ -213,8 +233,7 @@
56 // Default or not
57 if (layoutPath == Properties.Settings.Default.LibraryPath + @"\Default.xml" || String.IsNullOrEmpty(layoutPath))
58 {
59- ShowSplashScreen();
60- return;
61+ throw new Exception("Default layout");
62 }
63 else
64 {
65@@ -232,33 +251,16 @@
66 }
67 catch (Exception ex)
68 {
69- // couldnt open the layout file, so use the embedded one
70- System.Reflection.Assembly assembly = System.Reflection.Assembly.GetExecutingAssembly();
71- Stream resourceStream = assembly.GetManifestResourceStream("XiboClient.Resources.splash.jpg");
72-
73- // Load into a stream and then into an Image
74- try
75- {
76- Image bgSplash = Image.FromStream(resourceStream);
77-
78- Bitmap bmpSplash = new Bitmap(bgSplash, _clientSize);
79- this.BackgroundImage = bmpSplash;
80- }
81- catch
82- {
83- // Log
84- System.Diagnostics.Debug.WriteLine(ex.Message);
85- System.Diagnostics.Trace.WriteLine("Could not find the layout file {0}", layoutPath);
86- }
87- return;
88+ Trace.WriteLine(string.Format("Could not find the layout file {0}: {1}", layoutPath, ex.Message));
89+ throw;
90 }
91 }
92
93 // Attributes of the main layout node
94 XmlNode layoutNode = layoutXml.SelectSingleNode("/layout");
95-
96- XmlAttributeCollection layoutAttributes = layoutNode.Attributes;
97-
98+
99+ XmlAttributeCollection layoutAttributes = layoutNode.Attributes;
100+
101 // Set the background and size of the form
102 _layoutWidth = int.Parse(layoutAttributes["width"].Value);
103 _layoutHeight = int.Parse(layoutAttributes["height"].Value);
104@@ -266,7 +268,7 @@
105
106 // Scaling factor, will be applied to all regions
107 _scaleFactor = Math.Min(_clientSize.Width / _layoutWidth, _clientSize.Height / _layoutHeight);
108-
109+
110 // Want to be able to center this shiv - therefore work out which one of these is going to have left overs
111 int backgroundWidth = (int)(_layoutWidth * _scaleFactor);
112 int backgroundHeight = (int)(_layoutHeight * _scaleFactor);
113@@ -282,7 +284,7 @@
114 if (leftOverX != 0) leftOverX = leftOverX / 2;
115 if (leftOverY != 0) leftOverY = leftOverY / 2;
116 }
117- catch
118+ catch
119 {
120 leftOverX = 0;
121 leftOverY = 0;
122@@ -361,25 +363,24 @@
123 // Check to see if there are any regions on this layout.
124 if (listRegions.Count == 0 || listMedia.Count == 0)
125 {
126- Trace.WriteLine(new LogMessage("PrepareLayout",
127- string.Format("A layout with {0} regions and {1} media has been detected.", listRegions.Count.ToString(), listMedia.Count.ToString())),
128+ Trace.WriteLine(new LogMessage("PrepareLayout",
129+ string.Format("A layout with {0} regions and {1} media has been detected.", listRegions.Count.ToString(), listMedia.Count.ToString())),
130 LogType.Info.ToString());
131
132 if (_schedule.ActiveLayouts == 1)
133 {
134 Trace.WriteLine(new LogMessage("PrepareLayout", "Only 1 layout scheduled and it has nothing to show."), LogType.Info.ToString());
135
136- // Fall back to the splash screen (will only shift from here once a new schedule is detected)
137- ShowSplashScreen();
138+ throw new Exception("Only 1 layout schduled and it has nothing to show");
139 }
140 else
141 {
142- Trace.WriteLine(new LogMessage("PrepareLayout",
143+ Trace.WriteLine(new LogMessage("PrepareLayout",
144 string.Format(string.Format("An empty layout detected, will show for {0} seconds.", Properties.Settings.Default.emptyLayoutDuration.ToString()))), LogType.Info.ToString());
145
146 // Put a small dummy region in place, with a small dummy media node - which expires in 10 seconds.
147 XmlDocument dummyXml = new XmlDocument();
148- dummyXml.LoadXml(string.Format("<region id='blah' width='1' height='1' top='1' left='1'><media id='blah' type='text' duration='{0}'><raw><text></text></raw></media></region>",
149+ dummyXml.LoadXml(string.Format("<region id='blah' width='1' height='1' top='1' left='1'><media id='blah' type='text' duration='{0}'><raw><text></text></raw></media></region>",
150 Properties.Settings.Default.emptyLayoutDuration.ToString()));
151
152 // Replace the list of regions (they mean nothing as they are empty)
153@@ -400,10 +401,10 @@
154
155 options.scheduleId = _scheduleId;
156 options.layoutId = _layoutId;
157- options.width = (int) (double.Parse(nodeAttibutes["width"].Value) * _scaleFactor);
158- options.height = (int) (double.Parse(nodeAttibutes["height"].Value) * _scaleFactor);
159- options.left = (int) (double.Parse(nodeAttibutes["left"].Value) * _scaleFactor);
160- options.top = (int) (double.Parse(nodeAttibutes["top"].Value) * _scaleFactor);
161+ options.width = (int)(double.Parse(nodeAttibutes["width"].Value) * _scaleFactor);
162+ options.height = (int)(double.Parse(nodeAttibutes["height"].Value) * _scaleFactor);
163+ options.left = (int)(double.Parse(nodeAttibutes["left"].Value) * _scaleFactor);
164+ options.top = (int)(double.Parse(nodeAttibutes["top"].Value) * _scaleFactor);
165 options.scaleFactor = _scaleFactor;
166
167 // Set the backgrounds (used for Web content offsets)
168@@ -411,9 +412,9 @@
169 options.backgroundTop = options.top * -1;
170
171 //Account for scaling
172- options.left = options.left + (int) leftOverX;
173- options.top = options.top + (int) leftOverY;
174-
175+ options.left = options.left + (int)leftOverX;
176+ options.top = options.top + (int)leftOverY;
177+
178 // All the media nodes for this region / layout combination
179 options.mediaNodes = region.ChildNodes;
180
181@@ -421,7 +422,7 @@
182 temp.DurationElapsedEvent += new Region.DurationElapsedDelegate(temp_DurationElapsedEvent);
183
184 Debug.WriteLine("Created new region", "MainForm - Prepare Layout");
185-
186+
187 // Dont be fooled, this innocent little statement kicks everything off
188 temp.regionOptions = options;
189
190@@ -456,6 +457,8 @@
191
192 Bitmap bmpSplash = new Bitmap(bgSplash, _clientSize);
193 this.BackgroundImage = bmpSplash;
194+
195+ bgSplash.Dispose();
196 }
197 catch (Exception ex)
198 {
199
200=== modified file 'client/dotNET/Properties/Settings.Designer.cs'
201--- client/dotNET/Properties/Settings.Designer.cs 2010-09-26 14:33:38 +0000
202+++ client/dotNET/Properties/Settings.Designer.cs 2011-02-07 16:44:44 +0000
203@@ -47,7 +47,7 @@
204 [global::System.Configuration.UserScopedSettingAttribute()]
205 [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
206 [global::System.Configuration.SpecialSettingAttribute(global::System.Configuration.SpecialSetting.WebServiceUrl)]
207- [global::System.Configuration.DefaultSettingValueAttribute("http://localhost/xibo/xmds.php")]
208+ [global::System.Configuration.DefaultSettingValueAttribute("http://localhost/Series%201.2/server-121-soap-wsdl/server/xmds.php")]
209 public string XiboClient_xmds_xmds {
210 get {
211 return ((string)(this["XiboClient_xmds_xmds"]));
212
213=== modified file 'client/dotNET/Properties/Settings.settings'
214--- client/dotNET/Properties/Settings.settings 2010-09-26 14:33:38 +0000
215+++ client/dotNET/Properties/Settings.settings 2011-02-07 16:44:44 +0000
216@@ -9,7 +9,7 @@
217 <Value Profile="(Default)">schedule.xml</Value>
218 </Setting>
219 <Setting Name="XiboClient_xmds_xmds" Type="(Web Service URL)" Scope="User">
220- <Value Profile="(Default)">http://localhost/xibo/xmds.php</Value>
221+ <Value Profile="(Default)">http://localhost/Series%201.2/server-121-soap-wsdl/server/xmds.php</Value>
222 </Setting>
223 <Setting Name="ServerKey" Type="System.String" Scope="User">
224 <Value Profile="(Default)">yourserverkey</Value>
225
226=== modified file 'client/dotNET/Region.cs'
227--- client/dotNET/Region.cs 2010-08-26 19:23:14 +0000
228+++ client/dotNET/Region.cs 2011-02-07 16:44:44 +0000
229@@ -309,6 +309,14 @@
230 System.Diagnostics.Trace.WriteLine("Duration is Empty, using a default of 60.", "Region - SetNextMediaNode");
231 }
232
233+ // We cannot have a 0 duration here... not sure why we would... but
234+ if (options.duration == 0)
235+ options.duration = int.Parse(Properties.Settings.Default.emptyLayoutDuration.ToString());
236+
237+ // Fail safe
238+ if (options.duration == 0)
239+ options.duration = 10;
240+
241 // There will be some stuff on option nodes
242 XmlNode optionNode = mediaNode.FirstChild;
243
244
245=== modified file 'client/dotNET/RssReader.cs'
246--- client/dotNET/RssReader.cs 2010-09-26 17:37:39 +0000
247+++ client/dotNET/RssReader.cs 2011-02-07 16:44:44 +0000
248@@ -120,7 +120,7 @@
249 item.DateString = date;
250
251 // Fudge the date...
252- if (date.Contains("+"))
253+ if (date.Contains("+") || date.Contains("-"))
254 DateTime.TryParse(date, out item.Date);
255 else
256 DateTime.TryParse(date.Substring(0, date.Length - 4), out item.Date);
257
258=== modified file 'client/dotNET/Web References/xmds/Reference.cs'
259--- client/dotNET/Web References/xmds/Reference.cs 2009-12-31 11:38:50 +0000
260+++ client/dotNET/Web References/xmds/Reference.cs 2011-02-07 16:44:44 +0000
261@@ -1,7 +1,7 @@
262 //------------------------------------------------------------------------------
263 // <auto-generated>
264 // This code was generated by a tool.
265-// Runtime Version:2.0.50727.4927
266+// Runtime Version:2.0.50727.4952
267 //
268 // Changes to this file may cause incorrect behavior and will be lost if
269 // the code is regenerated.
270@@ -9,7 +9,7 @@
271 //------------------------------------------------------------------------------
272
273 //
274-// This source code was auto-generated by Microsoft.VSDesigner, Version 2.0.50727.4927.
275+// This source code was auto-generated by Microsoft.VSDesigner, Version 2.0.50727.4952.
276 //
277 #pragma warning disable 1591
278
279@@ -23,7 +23,7 @@
280
281
282 /// <remarks/>
283- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.4918")]
284+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.4927")]
285 [System.Diagnostics.DebuggerStepThroughAttribute()]
286 [System.ComponentModel.DesignerCategoryAttribute("code")]
287 [System.Web.Services.WebServiceBindingAttribute(Name="xmdsBinding", Namespace="urn:xmds")]
288@@ -421,11 +421,11 @@
289 }
290
291 /// <remarks/>
292- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.4918")]
293+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.4927")]
294 public delegate void RegisterDisplayCompletedEventHandler(object sender, RegisterDisplayCompletedEventArgs e);
295
296 /// <remarks/>
297- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.4918")]
298+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.4927")]
299 [System.Diagnostics.DebuggerStepThroughAttribute()]
300 [System.ComponentModel.DesignerCategoryAttribute("code")]
301 public partial class RegisterDisplayCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
302@@ -447,11 +447,11 @@
303 }
304
305 /// <remarks/>
306- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.4918")]
307+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.4927")]
308 public delegate void RequiredFilesCompletedEventHandler(object sender, RequiredFilesCompletedEventArgs e);
309
310 /// <remarks/>
311- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.4918")]
312+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.4927")]
313 [System.Diagnostics.DebuggerStepThroughAttribute()]
314 [System.ComponentModel.DesignerCategoryAttribute("code")]
315 public partial class RequiredFilesCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
316@@ -473,11 +473,11 @@
317 }
318
319 /// <remarks/>
320- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.4918")]
321+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.4927")]
322 public delegate void GetFileCompletedEventHandler(object sender, GetFileCompletedEventArgs e);
323
324 /// <remarks/>
325- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.4918")]
326+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.4927")]
327 [System.Diagnostics.DebuggerStepThroughAttribute()]
328 [System.ComponentModel.DesignerCategoryAttribute("code")]
329 public partial class GetFileCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
330@@ -499,11 +499,11 @@
331 }
332
333 /// <remarks/>
334- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.4918")]
335+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.4927")]
336 public delegate void ScheduleCompletedEventHandler(object sender, ScheduleCompletedEventArgs e);
337
338 /// <remarks/>
339- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.4918")]
340+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.4927")]
341 [System.Diagnostics.DebuggerStepThroughAttribute()]
342 [System.ComponentModel.DesignerCategoryAttribute("code")]
343 public partial class ScheduleCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
344@@ -525,11 +525,11 @@
345 }
346
347 /// <remarks/>
348- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.4918")]
349+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.4927")]
350 public delegate void RecieveXmlLogCompletedEventHandler(object sender, RecieveXmlLogCompletedEventArgs e);
351
352 /// <remarks/>
353- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.4918")]
354+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.4927")]
355 [System.Diagnostics.DebuggerStepThroughAttribute()]
356 [System.ComponentModel.DesignerCategoryAttribute("code")]
357 public partial class RecieveXmlLogCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
358@@ -551,11 +551,11 @@
359 }
360
361 /// <remarks/>
362- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.4918")]
363+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.4927")]
364 public delegate void BlackListCompletedEventHandler(object sender, BlackListCompletedEventArgs e);
365
366 /// <remarks/>
367- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.4918")]
368+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.4927")]
369 [System.Diagnostics.DebuggerStepThroughAttribute()]
370 [System.ComponentModel.DesignerCategoryAttribute("code")]
371 public partial class BlackListCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
372@@ -577,11 +577,11 @@
373 }
374
375 /// <remarks/>
376- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.4918")]
377+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.4927")]
378 public delegate void SubmitLogCompletedEventHandler(object sender, SubmitLogCompletedEventArgs e);
379
380 /// <remarks/>
381- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.4918")]
382+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.4927")]
383 [System.Diagnostics.DebuggerStepThroughAttribute()]
384 [System.ComponentModel.DesignerCategoryAttribute("code")]
385 public partial class SubmitLogCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
386@@ -603,11 +603,11 @@
387 }
388
389 /// <remarks/>
390- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.4918")]
391+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.4927")]
392 public delegate void SubmitStatsCompletedEventHandler(object sender, SubmitStatsCompletedEventArgs e);
393
394 /// <remarks/>
395- [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.4918")]
396+ [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.4927")]
397 [System.Diagnostics.DebuggerStepThroughAttribute()]
398 [System.ComponentModel.DesignerCategoryAttribute("code")]
399 public partial class SubmitStatsCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
400
401=== modified file 'client/dotNET/Web References/xmds/Reference.map'
402--- client/dotNET/Web References/xmds/Reference.map 2009-12-31 11:38:50 +0000
403+++ client/dotNET/Web References/xmds/Reference.map 2011-02-07 16:44:44 +0000
404@@ -1,6 +1,6 @@
405 <?xml version="1.0" encoding="utf-8"?>
406 <DiscoveryClientResultsFile xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
407 <Results>
408- <DiscoveryClientResult referenceType="System.Web.Services.Discovery.ContractReference" url="http://localhost/1.0.0/server/xmds.php?wsdl" filename="xmds.wsdl" />
409+ <DiscoveryClientResult referenceType="System.Web.Services.Discovery.ContractReference" url="http://localhost/Series 1.2/server-121-soap-wsdl/server/xmds.php?wsdl" filename="xmds.wsdl" />
410 </Results>
411 </DiscoveryClientResultsFile>
412\ No newline at end of file
413
414=== modified file 'client/dotNET/Web References/xmds/xmds.wsdl'
415--- client/dotNET/Web References/xmds/xmds.wsdl 2009-12-31 11:38:50 +0000
416+++ client/dotNET/Web References/xmds/xmds.wsdl 2011-02-07 16:44:44 +0000
417@@ -200,7 +200,7 @@
418 </wsdl:binding>
419 <wsdl:service name="xmds">
420 <wsdl:port name="xmdsPort" binding="tns:xmdsBinding">
421- <soap:address location="http://localhost/1.0.0/server/xmds.php" />
422+ <soap:address location="http://localhost/Series%201.2/server-121-soap-wsdl/server/xmds.php" />
423 </wsdl:port>
424 </wsdl:service>
425 </wsdl:definitions>
426\ No newline at end of file
427
428=== modified file 'client/dotNET/XiboClient.csproj'
429--- client/dotNET/XiboClient.csproj 2010-08-22 12:42:36 +0000
430+++ client/dotNET/XiboClient.csproj 2011-02-07 16:44:44 +0000
431@@ -267,10 +267,10 @@
432 <WebReferences Include="Web References\" />
433 </ItemGroup>
434 <ItemGroup>
435- <WebReferenceUrl Include="http://localhost/1.0.0/server/xmds.php%3fwsdl">
436+ <WebReferenceUrl Include="http://localhost/Series%25201.2/server-121-soap-wsdl/server/xmds.php%3fwsdl">
437 <UrlBehavior>Dynamic</UrlBehavior>
438 <RelPath>Web References\xmds\</RelPath>
439- <UpdateFromURL>http://localhost/1.0.0/server/xmds.php%3fwsdl</UpdateFromURL>
440+ <UpdateFromURL>http://localhost/Series%25201.2/server-121-soap-wsdl/server/xmds.php%3fwsdl</UpdateFromURL>
441 <ServiceLocationURL>
442 </ServiceLocationURL>
443 <CachedDynamicPropName>
444
445=== modified file 'client/dotNET/app.config'
446--- client/dotNET/app.config 2010-09-26 14:33:38 +0000
447+++ client/dotNET/app.config 2011-02-07 16:44:44 +0000
448@@ -14,7 +14,7 @@
449 <value>DEFAULT</value>
450 </setting>
451 <setting name="XiboClient_xmds_xmds" serializeAs="String">
452- <value>http://localhost/xibo/xmds.php</value>
453+ <value>http://localhost/Series%201.2/server-121-soap-wsdl/server/xmds.php</value>
454 </setting>
455 <setting name="ServerKey" serializeAs="String">
456 <value>yourserverkey</value>
457
458=== modified file 'server/lib/service/xmdssoap.class.php'
459--- server/lib/service/xmdssoap.class.php 2010-12-10 23:28:03 +0000
460+++ server/lib/service/xmdssoap.class.php 2011-02-07 16:44:44 +0000
461@@ -200,7 +200,7 @@
462 $SQL .= " INNER JOIN layout ";
463 $SQL .= " ON layout.LayoutID = lklayoutmedia.LayoutID";
464 $SQL .= sprintf(" WHERE layout.layoutid IN (%s) ", $layoutIdList);
465- $SQL .= " ORDER BY RecordType";
466+ $SQL .= " ORDER BY RecordType DESC";
467
468 if ($this->isAuditing == 1) Debug::LogEntry($db, "audit", $SQL, "xmds", "RequiredFiles");
469

Subscribers

People subscribed via source and target branches