Merge lp:~alexharrington/xibo/733119 into lp:xibo/1.3

[Alex Harrington]

=== modified file 'client/dotNET/CacheManager.cs'
--- client/dotNET/CacheManager.cs	2010-04-19 21:45:10 +0000
+++ client/dotNET/CacheManager.cs	2011-03-11 08:44:59 +0000
@@ -25,6 +25,7 @@
 using System.Windows.Forms;
 using System.Xml.Serialization;
 using System.Diagnostics;
+using System.Xml;
 
 namespace XiboClient
 {
@@ -173,7 +174,7 @@
         /// </summary>
         /// <param name="path"></param>
         /// <returns>True is it is and false if it isnt</returns>
-        public bool IsValid(String path)
+        public bool IsValidPath(String path)
         {
             // TODO: what makes a path valid?
             // Currently a path is valid if it is in the cache
@@ -185,6 +186,10 @@
             {
                 if (file.path == path)
                 {
+                    // If we cached it over 2 minutes ago, then check the GetLastWriteTime
+                    if (file.cacheDate > DateTime.Now.AddMinutes(-2))
+                        return true;
+
                     try
                     {
                         // Check to see if this file has been modified since the MD5 cache
@@ -209,6 +214,75 @@
             // Reached the end of the cache and havent found the file.
             return false;
         }
+
+        /// <summary>
+        /// Is the provided layout file a valid layout (has all media)
+        /// </summary>
+        /// <param name="layoutFile"></param>
+        /// <returns></returns>
+        public bool IsValidLayout(string layoutFile)
+        {
+            Debug.WriteLine("Checking Layout " + layoutFile + " is valid");
+
+            if (!IsValidPath(layoutFile))
+                return false;
+
+            // Load the XLF, get all media ID's
+            XmlDocument layoutXml = new XmlDocument();
+            layoutXml.Load(Properties.Settings.Default.LibraryPath + @"\" + layoutFile);
+
+            XmlNodeList mediaNodes = layoutXml.SelectNodes("//media");
+
+            foreach (XmlNode media in mediaNodes)
+            {
+                // Is this a stored media type?
+                switch (media.Attributes["type"].Value)
+                {
+                    case "video":
+                    case "image":
+                    case "flash":
+                    case "ppt":
+
+                        // Get the path and see if its valid
+                        if (!IsValidPath(media.InnerText))
+                            return false;
+
+                        break;
+
+                    default:
+                        continue;
+                }
+            }
+
+            return true;
+        }
+
+        /// <summary>
+        /// Regenerate from Required Files
+        /// </summary>
+        public void Regenerate()
+        {
+            if (!File.Exists(Application.UserAppDataPath + "\\" + Properties.Settings.Default.RequiredFilesFile))
+                return;
+
+            // Open the XML file and check each required file that isnt already there
+            XmlDocument xml = new XmlDocument();
+            xml.Load(Application.UserAppDataPath + "\\" + Properties.Settings.Default.RequiredFilesFile);
+
+            XmlNodeList fileNodes = xml.SelectNodes("//RequiredFile/Path");
+
+            foreach (XmlNode file in fileNodes)
+            {
+                string path = file.InnerText;
+
+                // Does the file exist?
+                if (!File.Exists(Properties.Settings.Default.LibraryPath + @"\" + path))
+                    continue;
+
+                // Add this file to the cache manager
+                Add(path, GetMD5(path));
+            }
+        }
     }
 
     public struct Md5Resource

=== modified file 'client/dotNET/FileCollector.cs'
--- client/dotNET/FileCollector.cs	2011-01-30 18:13:32 +0000
+++ client/dotNET/FileCollector.cs	2011-03-11 08:44:59 +0000
@@ -31,28 +31,26 @@
     class FileCollector
     {
         private CacheManager _cacheManager;
+        private RequiredFiles _requiredFiles;
+        private XmlDocument _xml;
 
         public FileCollector(CacheManager cacheManager, string xmlString)
         {
             _cacheManager = cacheManager;
 
-            xml = new XmlDocument();
+            // Load the XML file RF call
+            _xml = new XmlDocument();
+            _xml.LoadXml(xmlString);
 
-            try
-            {
-                xml.LoadXml(xmlString);
-            }
-            catch (Exception e)
-            {
-                //Log this error
-                System.Diagnostics.Debug.WriteLine(e.Message);
-            }
+            // Create a required files object
+            _requiredFiles = new RequiredFiles();
+            _requiredFiles.RequiredFilesXml = _xml;
 
             // Get the key for later use
             hardwareKey = new HardwareKey();
 
             // Make a new filelist collection
-            files = new Collection<FileList>();
+            _files = new Collection<RequiredFile>();
 
             // Create a webservice call
             xmdsFile = new XiboClient.xmds.xmds();
@@ -73,13 +71,13 @@
         /// </summary>
         public void CompareAndCollect()
         {
-            XmlNodeList fileNodes = xml.SelectNodes("/files/file");
+            XmlNodeList fileNodes = _xml.SelectNodes("/files/file");
 
             //Inspect each file we have here
             foreach (XmlNode file in fileNodes)
             {
                 XmlAttributeCollection attributes = file.Attributes;
-                FileList fileList = new FileList();
+                RequiredFile fileList = new RequiredFile();
 
                 if (attributes["type"].Value == "layout")
                 {
@@ -120,13 +118,15 @@
                             fileList.md5 = attributes["md5"].Value;
                             fileList.retrys = 0;
 
-                            files.Add(fileList);
+                            _files.Add(fileList);
                         }
                         else
                         {
                             // The MD5 of the current file and the MD5 in RequiredFiles are the same.
                             // Therefore make sure this MD5 is in the CacheManager
                             _cacheManager.Add(path + ".xlf", md5);
+
+                            _requiredFiles.MarkComplete(int.Parse(path), md5); 
                         }
                     }
                     else
@@ -141,7 +141,7 @@
                         fileList.md5 = attributes["md5"].Value;
                         fileList.retrys = 0;
 
-                        files.Add(fileList);
+                        _files.Add(fileList);
                     }
                 }
                 else if (attributes["type"].Value == "media")
@@ -183,13 +183,16 @@
                             fileList.md5 = attributes["md5"].Value;
                             fileList.retrys = 0;
 
-                            files.Add(fileList);
+                            _files.Add(fileList);
                         }
                         else
                         {
                             // The MD5 of the current file and the MD5 in RequiredFiles are the same.
                             // Therefore make sure this MD5 is in the CacheManager
                             _cacheManager.Add(path, md5);
+
+                            string[] filePart = path.Split('.');
+                            _requiredFiles.MarkComplete(int.Parse(filePart[0]), md5); 
                         }
                     }
                     else
@@ -205,7 +208,7 @@
                         fileList.md5 = attributes["md5"].Value;
                         fileList.retrys = 0;
 
-                        files.Add(fileList);
+                        _files.Add(fileList);
                     }
                 }
                 else if (attributes["type"].Value == "blacklist")
@@ -234,6 +237,7 @@
                 }
             }
 
+<<<<<<< TREE
             Debug.WriteLine(String.Format("There are {0} files to get", files.Count.ToString()));
 
             // Output a list of the files we need to get
@@ -243,9 +247,26 @@
                 debugMessage += string.Format("File: {0}, Type: {1}, MD5: {2}. ", fileToGet.path, fileToGet.type, fileToGet.md5);
 
             Debug.WriteLine(debugMessage);
+=======
+            Debug.WriteLine(String.Format("There are {0} files to get", _files.Count.ToString()));
+
+            // Output a list of the files we need to get
+            string debugMessage = "";
+
+            foreach (RequiredFile fileToGet in _files)
+                debugMessage += string.Format("File: {0}, Type: {1}, MD5: {2}. ", fileToGet.path, fileToGet.type, fileToGet.md5);
+
+            Debug.WriteLine(debugMessage);
+
+            // Report the files files back to XMDS
+            _requiredFiles.ReportInventory();
+
+            // Write Required Files
+            _requiredFiles.WriteRequiredFiles();
+>>>>>>> MERGE-SOURCE
 
             // Is there anything to get?
-            if (files.Count == 0)
+            if (_files.Count == 0)
             {
                 CollectionComplete();
                 return;
@@ -255,7 +276,7 @@
             _currentFile = 0;
 
             // Preload the first filelist
-            _currentFileList = files[_currentFile];
+            _currentFileList = _files[_currentFile];
 
             // Get the first file
             GetFile();
@@ -375,6 +396,10 @@
                         {
                             // Add to the CacheManager
                             _cacheManager.Add(_currentFileList.path + ".xlf", md5sum);
+
+                            // Report this completion back to XMDS
+                            _requiredFiles.MarkComplete(int.Parse(_currentFileList.path), md5sum);
+                            _requiredFiles.ReportInventory();
                         }
 
                         // Fire a layout complete event
@@ -445,6 +470,11 @@
 
                                 System.Diagnostics.Debug.WriteLine(string.Format("File downloaded: {0}", _currentFileList.path));
 
+                                // Report this completion back to XMDS
+                                string[] filePart = _currentFileList.path.Split('.');
+                                _requiredFiles.MarkComplete(int.Parse(filePart[0]), md5sum);
+                                _requiredFiles.ReportInventory();
+
                                 // All the file has been recieved. Move on to the next file.
                                 _currentFile++;
                             }
@@ -475,13 +505,16 @@
         /// </summary>
         public void GetFile()
         {
-            if (_currentFile > (files.Count - 1))
+            if (_currentFile > (_files.Count - 1))
             {
-                System.Diagnostics.Debug.WriteLine(String.Format("Finished Recieving {0} files", files.Count));
+                System.Diagnostics.Debug.WriteLine(String.Format("Finished Receiving {0} files", _files.Count));
 
                 // Clean up
-                files.Clear();
-                xmdsFile.Dispose();                
+                _files.Clear();
+                xmdsFile.Dispose();
+             
+                // Write Required Files
+                _requiredFiles.WriteRequiredFiles();
 
                 // Finished getting this file list
                 CollectionComplete();
@@ -491,7 +524,7 @@
                 // Get the current file into the currentfilelist if the current one is finished
                 if (_currentFileList.complete)
                 {
-                    _currentFileList = files[_currentFile];
+                    _currentFileList = _files[_currentFile];
                 }
 
                 System.Diagnostics.Debug.WriteLine(String.Format("Getting the file : {0} chunk : {1}", _currentFileList.path, _currentFileList.chunkOffset.ToString()));
@@ -504,7 +537,7 @@
         }
 
         [Serializable]
-        private struct FileList
+        private struct RequiredFile
         {
             public string path;
             public string type;
@@ -519,9 +552,9 @@
 
         private XmlDocument xml;
         private HardwareKey hardwareKey;
-        private Collection<FileList> files;
+        private Collection<RequiredFile> _files;
         private int _currentFile;
-        private FileList _currentFileList;
+        private RequiredFile _currentFileList;
         private xmds.xmds xmdsFile;
 
         public event LayoutFileChangedDelegate LayoutFileChanged;

=== modified file 'client/dotNET/MainForm.cs'
--- client/dotNET/MainForm.cs	2011-01-30 18:13:32 +0000
+++ client/dotNET/MainForm.cs	2011-03-11 08:44:59 +0000
@@ -72,14 +72,45 @@
 
             _statLog = new StatLog();
 
+            this.FormClosing += new FormClosingEventHandler(MainForm_FormClosing);
+            this.Shown += new EventHandler(MainForm_Shown);
+        }
+
+        /// <summary>
+        /// Called after the form has been shown
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        void MainForm_Shown(object sender, EventArgs e)
+        {
+            // Process any stuff that has happened during the loading process
+            Application.DoEvents();
+
             // Create a cachemanager
             SetCacheManager();
 
-            this.FormClosing += new FormClosingEventHandler(MainForm_FormClosing);
+            try
+            {
+                // Create the Schedule
+                _schedule = new Schedule(Application.UserAppDataPath + "\\" + Properties.Settings.Default.ScheduleFile, ref _cacheManager);
+
+                // Bind to the schedule change event - notifys of changes to the schedule
+                _schedule.ScheduleChangeEvent += new Schedule.ScheduleChangeDelegate(schedule_ScheduleChangeEvent);
+
+                // Initialize the other schedule components
+                _schedule.InitializeComponents();
+            }
+            catch (Exception ex)
+            {
+                Debug.WriteLine(ex.Message, LogType.Error.ToString());
+                MessageBox.Show("Fatal Error initialising the application", "Fatal Error");
+                Close();
+                Dispose();
+            }
         }
 
         /// <summary>
-        /// Called when the form has finished loading
+        /// Called before the form has loaded for the first time
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
@@ -96,30 +127,13 @@
             Cursor.Position = new Point(_clientSize.Width, _clientSize.Height);
             Cursor.Hide();
 
+            ShowSplashScreen();
+
             // Change the default Proxy class
             OptionForm.SetGlobalProxy();
 
             // UserApp data
             Debug.WriteLine(new LogMessage("MainForm_Load", "User AppData Path: " + Application.UserAppDataPath), LogType.Info.ToString());
-
-            try
-            {
-                // Create the Schedule
-                _schedule = new Schedule(Application.UserAppDataPath + "\\" + Properties.Settings.Default.ScheduleFile, ref _cacheManager);
-
-                // Bind to the schedule change event - notifys of changes to the schedule
-                _schedule.ScheduleChangeEvent += new Schedule.ScheduleChangeDelegate(schedule_ScheduleChangeEvent);
-
-                // Initialize the other schedule components
-                _schedule.InitializeComponents();
-            }
-            catch (Exception ex)
-            {
-                Debug.WriteLine(ex.Message, LogType.Error.ToString());
-                MessageBox.Show("Fatal Error initialising the application", "Fatal Error");
-                Close();
-                Dispose();
-            }
         }
 
         private void MainForm_FormClosing(object sender, FormClosingEventArgs e)
@@ -152,11 +166,20 @@
             }
             catch (Exception ex)
             {
-                Trace.WriteLine(new LogMessage("Schedule", "Unable to reuse the Cache Manager because: " + ex.Message));
+                Trace.WriteLine(new LogMessage("MainForm - SetCacheManager", "Unable to reuse the Cache Manager because: " + ex.Message));
 
                 // Create a new cache manager
                 _cacheManager = new CacheManager();
             }
+
+            try
+            {
+                _cacheManager.Regenerate();
+            }
+            catch (Exception ex)
+            {
+                Trace.WriteLine(new LogMessage("MainForm - SetCacheManager", "Regenerate failed because: " + ex.Message));
+            }
         }
 
         /// <summary>

=== modified file 'client/dotNET/Properties/Settings.Designer.cs'
--- client/dotNET/Properties/Settings.Designer.cs	2010-11-09 21:23:31 +0000
+++ client/dotNET/Properties/Settings.Designer.cs	2011-03-11 08:44:59 +0000
@@ -271,7 +271,7 @@
         
         [global::System.Configuration.ApplicationScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-        [global::System.Configuration.DefaultSettingValueAttribute("1.2.0")]
+        [global::System.Configuration.DefaultSettingValueAttribute("1.2.2")]
         public string ClientVersion {
             get {
                 return ((string)(this["ClientVersion"]));
@@ -370,5 +370,17 @@
                 this["emptyLayoutDuration"] = value;
             }
         }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("requiredFiles.xml")]
+        public string RequiredFilesFile {
+            get {
+                return ((string)(this["RequiredFilesFile"]));
+            }
+            set {
+                this["RequiredFilesFile"] = value;
+            }
+        }
     }
 }

=== modified file 'client/dotNET/Properties/Settings.settings'
--- client/dotNET/Properties/Settings.settings	2010-11-09 21:23:31 +0000
+++ client/dotNET/Properties/Settings.settings	2011-03-11 08:44:59 +0000
@@ -69,7 +69,7 @@
       <Value Profile="(Default)">cacheManager.xml</Value>
     </Setting>
     <Setting Name="ClientVersion" Type="System.String" Scope="Application">
-      <Value Profile="(Default)">1.2.0</Value>
+      <Value Profile="(Default)">1.2.2</Value>
     </Setting>
     <Setting Name="scrollStepAmount" Type="System.Decimal" Scope="User">
       <Value Profile="(Default)">1</Value>
@@ -95,5 +95,8 @@
     <Setting Name="emptyLayoutDuration" Type="System.Decimal" Scope="User">
       <Value Profile="(Default)">10</Value>
     </Setting>
+    <Setting Name="RequiredFilesFile" Type="System.String" Scope="User">
+      <Value Profile="(Default)">requiredFiles.xml</Value>
+    </Setting>
   </Settings>
 </SettingsFile>
\ No newline at end of file

=== modified file 'client/dotNET/Region.cs'
--- client/dotNET/Region.cs	2010-11-09 21:23:31 +0000
+++ client/dotNET/Region.cs	2011-03-11 08:44:59 +0000
@@ -309,6 +309,7 @@
                         System.Diagnostics.Trace.WriteLine("Duration is Empty, using a default of 60.", "Region - SetNextMediaNode");
                     }
 
+<<<<<<< TREE
                     // We cannot have a 0 duration here... not sure why we would... but
                     if (options.duration == 0)
                         options.duration = int.Parse(Properties.Settings.Default.emptyLayoutDuration.ToString());
@@ -317,6 +318,15 @@
                     if (options.duration == 0)
                         options.duration = 10;
 
+=======
+                    // We cannot have a 0 duration here... not sure why we would... but
+                    if (options.duration == 0 && options.type != "video")
+                    {
+                        int emptyLayoutDuration = int.Parse(Properties.Settings.Default.emptyLayoutDuration.ToString());
+                        options.duration = (emptyLayoutDuration == 0) ? 10 : emptyLayoutDuration;
+                    }
+
+>>>>>>> MERGE-SOURCE
                     // There will be some stuff on option nodes
                     XmlNode optionNode = mediaNode.FirstChild;                    
 
@@ -386,7 +396,7 @@
                     if (options.type == "video" || options.type == "flash" || options.type == "image" || options.type == "powerpoint")
                     {
                         // Use the cache manager to determine if the file is valid
-                        validNode = _cacheManager.IsValid(options.uri);
+                        validNode = _cacheManager.IsValidPath(options.uri);
                     }
                 }
 

=== added file 'client/dotNET/RequiredFiles.cs'
--- client/dotNET/RequiredFiles.cs	1970-01-01 00:00:00 +0000
+++ client/dotNET/RequiredFiles.cs	2011-03-11 08:44:59 +0000
@@ -0,0 +1,206 @@
+/*
+ * Xibo - Digitial Signage - http://www.xibo.org.uk
+ * Copyright (C) 2011 Daniel Garner
+ *
+ * This file is part of Xibo.
+ *
+ * Xibo is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * any later version. 
+ *
+ * Xibo is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with Xibo.  If not, see <http://www.gnu.org/licenses/>.
+ */
+using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Text;
+using System.IO;
+using System.Security.Cryptography;
+using System.Xml;
+using System.Diagnostics;
+using System.Windows.Forms;
+using System.Xml.Serialization;
+
+namespace XiboClient
+{
+    public class RequiredFiles
+    {
+        private XmlDocument _requiredFilesXml;
+        public Collection<RequiredFile> _requiredFiles;
+        private xmds.xmds _report;
+
+        public RequiredFiles()
+        {
+            _requiredFiles = new Collection<RequiredFile>();
+
+            // Create a webservice call
+            _report = new XiboClient.xmds.xmds();
+
+            // Start up the Xmds Service Object
+            _report.Credentials = null;
+            _report.Url = Properties.Settings.Default.XiboClient_xmds_xmds;
+            _report.UseDefaultCredentials = false;
+        }
+
+        /// <summary>
+        /// Set required files from the XML document
+        /// </summary>
+        private void SetRequiredFiles()
+        {
+            // Itterate through the RF XML and populate the RF collection
+            XmlNodeList fileNodes = _requiredFilesXml.SelectNodes("/files/file");
+
+            foreach (XmlNode file in fileNodes)
+            {
+                RequiredFile rf = new RequiredFile(); 
+                
+                XmlAttributeCollection attributes = file.Attributes;
+
+                rf.FileType = attributes["type"].Value;
+                rf.Complete = 0;
+                rf.Md5 = "";
+                rf.LastChecked = DateTime.Now;
+
+                if (rf.FileType == "media")
+                {
+                    string[] filePart = attributes["path"].Value.Split('.');
+                    rf.Id = int.Parse(filePart[0]);
+                    rf.Path = attributes["path"].Value;
+                }
+                else if (rf.FileType == "layout")
+                {
+                    rf.Id = int.Parse(attributes["path"].Value);
+                    rf.Path = attributes["path"].Value + ".xlf";
+                }
+                else
+                {
+                    continue;
+                }
+
+                _requiredFiles.Add(rf);
+            }
+        }
+
+        /// <summary>
+        /// Required Files XML
+        /// </summary>
+        public XmlDocument RequiredFilesXml
+        {
+            set
+            {
+                _requiredFilesXml = value;
+                SetRequiredFiles();
+            }
+        }
+
+        /// <summary>
+        /// Mark a RequiredFile as complete
+        /// </summary>
+        /// <param name="id"></param>
+        /// <param name="md5"></param>
+        public void MarkComplete(int id, string md5)
+        {
+            foreach (RequiredFile rf in _requiredFiles)
+            {
+                if (rf.Id == id)
+                {
+                    RequiredFile newRf = rf;
+
+                    newRf.Complete = 1;
+                    newRf.Md5 = md5;
+
+
+                    _requiredFiles.Add(newRf);
+                    _requiredFiles.Remove(rf);
+
+                    return;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Mark a RequiredFile as incomplete
+        /// </summary>
+        /// <param name="id"></param>
+        /// <param name="md5"></param>
+        public void MarkIncomplete(int id, string md5)
+        {
+            foreach (RequiredFile rf in _requiredFiles)
+            {
+                if (rf.Id == id)
+                {
+                    RequiredFile newRf = rf;
+
+                    newRf.Complete = 0;
+                    newRf.Md5 = md5;
+
+                    _requiredFiles.Add(newRf);
+                    _requiredFiles.Remove(rf);
+
+                    return;
+                }
+            }
+        }
+
+        /// <summary>
+        /// Writes Required Files to disk
+        /// </summary>
+        public void WriteRequiredFiles()
+        {
+            Debug.WriteLine(new LogMessage("RequiredFiles - WriteRequiredFiles", "About to Write RequiredFiles"), LogType.Info.ToString());
+
+            try
+            {
+                using (StreamWriter streamWriter = new StreamWriter(Application.UserAppDataPath + "\\" + Properties.Settings.Default.RequiredFilesFile))
+                {
+                    XmlSerializer xmlSerializer = new XmlSerializer(typeof(RequiredFiles));
+
+                    xmlSerializer.Serialize(streamWriter, this);
+                }
+            }
+            catch (Exception ex)
+            {
+                System.Diagnostics.Trace.WriteLine(new LogMessage("RequiredFiles - WriteRequiredFiles", "Unable to write RequiredFiles to disk because: " + ex.Message));
+            }
+        }
+
+        /// <summary>
+        /// Report Required Files to XMDS
+        /// </summary>
+        public void ReportInventory()
+        {
+            HardwareKey hardwareKey = new HardwareKey();
+
+            // Build the XML required by media file
+            string xml = "";
+            
+            foreach (RequiredFile rf in _requiredFiles)
+            {
+                xml += string.Format("<file type=\"{0}\" id=\"{1}\" complete=\"{2}\" lastChecked=\"{3}\" md5=\"{4}\" />", 
+                    rf.FileType, rf.Id.ToString(), rf.Complete.ToString(), rf.LastChecked.ToString(), rf.Md5);
+            }
+
+            xml = string.Format("<files>{0}</files>", xml);
+
+            _report.MediaInventoryAsync(Properties.Settings.Default.Version, Properties.Settings.Default.ServerKey,
+                hardwareKey.Key, xml);
+        }
+    }
+
+    public struct RequiredFile
+    {
+        public string FileType;
+        public int Id;
+        public int Complete;
+        public DateTime LastChecked;
+        public string Md5;
+        public string Path;
+    }
+}

=== modified file 'client/dotNET/Schedule.cs'
--- client/dotNET/Schedule.cs	2010-08-22 16:49:09 +0000
+++ client/dotNET/Schedule.cs	2011-03-11 08:44:59 +0000
@@ -74,7 +74,7 @@
             _cacheManager = cacheManager;
 
             // Create a schedule manager
-            _scheduleManager = new ScheduleManager(scheduleLocation);
+            _scheduleManager = new ScheduleManager(_cacheManager, scheduleLocation);
 
             // Create a new Xmds service object
             _xmds2 = new XiboClient.xmds.xmds();

=== modified file 'client/dotNET/ScheduleManager.cs'
--- client/dotNET/ScheduleManager.cs	2010-08-25 21:39:53 +0000
+++ client/dotNET/ScheduleManager.cs	2011-03-11 08:44:59 +0000
@@ -42,13 +42,15 @@
         private Collection<LayoutSchedule> _layoutSchedule;
         private Collection<LayoutSchedule> _currentSchedule;
         private bool _refreshSchedule;
+        private CacheManager _cacheManager;
 
         /// <summary>
         /// Creates a new schedule Manager
         /// </summary>
         /// <param name="scheduleLocation"></param>
-        public ScheduleManager(string scheduleLocation)
+        public ScheduleManager(CacheManager cacheManager, string scheduleLocation)
         {
+            _cacheManager = cacheManager;
             _location = scheduleLocation;
 
             // Create an empty layout schedule
@@ -178,6 +180,19 @@
             // For each layout in the schedule determine if it is currently inside the _currentSchedule, and whether it should be
             foreach (LayoutSchedule layout in _layoutSchedule)
             {
+                // Is the layout valid in the cachemanager?
+                try
+                {
+                    if (!_cacheManager.IsValidLayout(layout.id + ".xlf"))
+                        continue;
+                }
+                catch
+                {
+                    // TODO: Ignore this layout.. raise an error?
+                    Trace.WriteLine("Unable to determine if layout is valid or not");
+                    continue;
+                }
+
                 // If this is the default, skip it
                 if (layout.NodeName == "default")
                 {

=== modified file 'client/dotNET/Web References/xmds/Reference.cs'
--- client/dotNET/Web References/xmds/Reference.cs	2010-11-09 21:23:31 +0000
+++ client/dotNET/Web References/xmds/Reference.cs	2011-03-11 08:44:59 +0000
@@ -45,6 +45,8 @@
         
         private System.Threading.SendOrPostCallback SubmitStatsOperationCompleted;
         
+        private System.Threading.SendOrPostCallback MediaInventoryOperationCompleted;
+        
         private bool useDefaultCredentialsSetExplicitly;
         
         /// <remarks/>
@@ -108,6 +110,9 @@
         public event SubmitStatsCompletedEventHandler SubmitStatsCompleted;
         
         /// <remarks/>
+        public event MediaInventoryCompletedEventHandler MediaInventoryCompleted;
+        
+        /// <remarks/>
         [System.Web.Services.Protocols.SoapRpcMethodAttribute("urn:xmds#RegisterDisplay", RequestNamespace="urn:xmds", ResponseNamespace="urn:xmds")]
         [return: System.Xml.Serialization.SoapElementAttribute("ActivationMessage")]
         public string RegisterDisplay(string serverKey, string hardwareKey, string displayName, string version) {
@@ -402,6 +407,42 @@
         }
         
         /// <remarks/>
+        [System.Web.Services.Protocols.SoapRpcMethodAttribute("urn:xmds#MediaInventory", RequestNamespace="urn:xmds", ResponseNamespace="urn:xmds")]
+        [return: System.Xml.Serialization.SoapElementAttribute("success")]
+        public bool MediaInventory(string version, string serverKey, string hardwareKey, [System.Xml.Serialization.SoapElementAttribute("mediaInventory")] string mediaInventory1) {
+            object[] results = this.Invoke("MediaInventory", new object[] {
+                        version,
+                        serverKey,
+                        hardwareKey,
+                        mediaInventory1});
+            return ((bool)(results[0]));
+        }
+        
+        /// <remarks/>
+        public void MediaInventoryAsync(string version, string serverKey, string hardwareKey, string mediaInventory1) {
+            this.MediaInventoryAsync(version, serverKey, hardwareKey, mediaInventory1, null);
+        }
+        
+        /// <remarks/>
+        public void MediaInventoryAsync(string version, string serverKey, string hardwareKey, string mediaInventory1, object userState) {
+            if ((this.MediaInventoryOperationCompleted == null)) {
+                this.MediaInventoryOperationCompleted = new System.Threading.SendOrPostCallback(this.OnMediaInventoryOperationCompleted);
+            }
+            this.InvokeAsync("MediaInventory", new object[] {
+                        version,
+                        serverKey,
+                        hardwareKey,
+                        mediaInventory1}, this.MediaInventoryOperationCompleted, userState);
+        }
+        
+        private void OnMediaInventoryOperationCompleted(object arg) {
+            if ((this.MediaInventoryCompleted != null)) {
+                System.Web.Services.Protocols.InvokeCompletedEventArgs invokeArgs = ((System.Web.Services.Protocols.InvokeCompletedEventArgs)(arg));
+                this.MediaInventoryCompleted(this, new MediaInventoryCompletedEventArgs(invokeArgs.Results, invokeArgs.Error, invokeArgs.Cancelled, invokeArgs.UserState));
+            }
+        }
+        
+        /// <remarks/>
         public new void CancelAsync(object userState) {
             base.CancelAsync(userState);
         }
@@ -627,6 +668,32 @@
             }
         }
     }
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.4927")]
+    public delegate void MediaInventoryCompletedEventHandler(object sender, MediaInventoryCompletedEventArgs e);
+    
+    /// <remarks/>
+    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Web.Services", "2.0.50727.4927")]
+    [System.Diagnostics.DebuggerStepThroughAttribute()]
+    [System.ComponentModel.DesignerCategoryAttribute("code")]
+    public partial class MediaInventoryCompletedEventArgs : System.ComponentModel.AsyncCompletedEventArgs {
+        
+        private object[] results;
+        
+        internal MediaInventoryCompletedEventArgs(object[] results, System.Exception exception, bool cancelled, object userState) : 
+                base(exception, cancelled, userState) {
+            this.results = results;
+        }
+        
+        /// <remarks/>
+        public bool Result {
+            get {
+                this.RaiseExceptionIfNecessary();
+                return ((bool)(this.results[0]));
+            }
+        }
+    }
 }
 
 #pragma warning restore 1591
\ No newline at end of file

=== modified file 'client/dotNET/Web References/xmds/xmds.wsdl'
--- client/dotNET/Web References/xmds/xmds.wsdl	2010-11-09 21:23:31 +0000
+++ client/dotNET/Web References/xmds/xmds.wsdl	2011-03-11 08:44:59 +0000
@@ -81,6 +81,15 @@
   <wsdl:message name="SubmitStatsResponse">
     <wsdl:part name="success" type="xsd:boolean" />
   </wsdl:message>
+  <wsdl:message name="MediaInventoryRequest">
+    <wsdl:part name="version" type="xsd:string" />
+    <wsdl:part name="serverKey" type="xsd:string" />
+    <wsdl:part name="hardwareKey" type="xsd:string" />
+    <wsdl:part name="mediaInventory" type="xsd:string" />
+  </wsdl:message>
+  <wsdl:message name="MediaInventoryResponse">
+    <wsdl:part name="success" type="xsd:boolean" />
+  </wsdl:message>
   <wsdl:portType name="xmdsPortType">
     <wsdl:operation name="RegisterDisplay">
       <documentation>Registered the Display on the Xibo Network</documentation>
@@ -122,6 +131,11 @@
       <wsdl:input message="tns:SubmitStatsRequest" />
       <wsdl:output message="tns:SubmitStatsResponse" />
     </wsdl:operation>
+    <wsdl:operation name="MediaInventory">
+      <documentation>Report back the clients MediaInventory</documentation>
+      <wsdl:input message="tns:MediaInventoryRequest" />
+      <wsdl:output message="tns:MediaInventoryResponse" />
+    </wsdl:operation>
   </wsdl:portType>
   <wsdl:binding name="xmdsBinding" type="tns:xmdsPortType">
     <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="rpc" />
@@ -197,6 +211,15 @@
         <soap:body use="encoded" namespace="urn:xmds" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
       </wsdl:output>
     </wsdl:operation>
+    <wsdl:operation name="MediaInventory">
+      <soap:operation soapAction="urn:xmds#MediaInventory" style="rpc" />
+      <wsdl:input>
+        <soap:body use="encoded" namespace="urn:xmds" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+      </wsdl:input>
+      <wsdl:output>
+        <soap:body use="encoded" namespace="urn:xmds" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" />
+      </wsdl:output>
+    </wsdl:operation>
   </wsdl:binding>
   <wsdl:service name="xmds">
     <wsdl:port name="xmdsPort" binding="tns:xmdsBinding">

=== modified file 'client/dotNET/XiboClient.csproj'
--- client/dotNET/XiboClient.csproj	2011-02-09 17:15:43 +0000
+++ client/dotNET/XiboClient.csproj	2011-03-11 08:44:59 +0000
@@ -161,6 +161,7 @@
     <Compile Include="Region.cs">
       <SubType>Component</SubType>
     </Compile>
+    <Compile Include="RequiredFiles.cs" />
     <Compile Include="Rss.cs">
       <SubType>Form</SubType>
     </Compile>

=== modified file 'client/dotNET/app.config'
--- client/dotNET/app.config	2010-11-09 21:23:31 +0000
+++ client/dotNET/app.config	2011-03-11 08:44:59 +0000
@@ -79,6 +79,9 @@
             <setting name="emptyLayoutDuration" serializeAs="String">
                 <value>10</value>
             </setting>
+            <setting name="RequiredFilesFile" serializeAs="String">
+                <value>requiredFiles.xml</value>
+            </setting>
         </XiboClient.Properties.Settings>
     </userSettings>
     <applicationSettings>
@@ -102,7 +105,7 @@
                 <value>cacheManager.xml</value>
             </setting>
             <setting name="ClientVersion" serializeAs="String">
-                <value>1.2.0</value>
+                <value>1.2.2</value>
             </setting>
             <setting name="xmdsResetTimeout" serializeAs="String">
                 <value>900</value>

=== modified file 'client/dotNET/bin/Release/AxInterop.ShockwaveFlashObjects.dll'
Binary files client/dotNET/bin/Release/AxInterop.ShockwaveFlashObjects.dll	2010-04-19 21:45:10 +0000 and client/dotNET/bin/Release/AxInterop.ShockwaveFlashObjects.dll	2011-03-11 08:44:59 +0000 differ
=== modified file 'client/dotNET/bin/Release/AxInterop.WMPLib.dll'
Binary files client/dotNET/bin/Release/AxInterop.WMPLib.dll	2010-04-19 21:45:10 +0000 and client/dotNET/bin/Release/AxInterop.WMPLib.dll	2011-03-11 08:44:59 +0000 differ
=== modified file 'client/dotNET/bin/Release/Interop.ShockwaveFlashObjects.dll'
Binary files client/dotNET/bin/Release/Interop.ShockwaveFlashObjects.dll	2010-04-19 21:45:10 +0000 and client/dotNET/bin/Release/Interop.ShockwaveFlashObjects.dll	2011-03-11 08:44:59 +0000 differ
=== modified file 'client/dotNET/bin/Release/Interop.WMPLib.dll'
Binary files client/dotNET/bin/Release/Interop.WMPLib.dll	2010-04-19 21:45:10 +0000 and client/dotNET/bin/Release/Interop.WMPLib.dll	2011-03-11 08:44:59 +0000 differ
=== modified file 'client/dotNET/bin/Release/XiboClient.exe.config'
--- client/dotNET/bin/Release/XiboClient.exe.config	2010-04-19 21:45:10 +0000
+++ client/dotNET/bin/Release/XiboClient.exe.config	2011-03-11 08:44:59 +0000
@@ -14,7 +14,7 @@
                 <value>DEFAULT</value>
             </setting>
             <setting name="XiboClient_xmds_xmds" serializeAs="String">
-                <value>http://localhost/xibo/xmds.php</value>
+                <value>http://localhost/Series%201.2/server-121-soap-wsdl/server/xmds.php</value>
             </setting>
             <setting name="ServerKey" serializeAs="String">
                 <value>yourserverkey</value>
@@ -61,6 +61,27 @@
             <setting name="scrollStepAmount" serializeAs="String">
                 <value>1</value>
             </setting>
+            <setting name="sizeX" serializeAs="String">
+                <value>0</value>
+            </setting>
+            <setting name="sizeY" serializeAs="String">
+                <value>0</value>
+            </setting>
+            <setting name="offsetX" serializeAs="String">
+                <value>0</value>
+            </setting>
+            <setting name="offsetY" serializeAs="String">
+                <value>0</value>
+            </setting>
+            <setting name="expireModifiedLayouts" serializeAs="String">
+                <value>True</value>
+            </setting>
+            <setting name="emptyLayoutDuration" serializeAs="String">
+                <value>10</value>
+            </setting>
+            <setting name="RequiredFilesFile" serializeAs="String">
+                <value>requiredFiles.xml</value>
+            </setting>
         </XiboClient.Properties.Settings>
     </userSettings>
     <applicationSettings>
@@ -75,7 +96,7 @@
                 <value>blacklist.xml</value>
             </setting>
             <setting name="Version" serializeAs="String">
-                <value>1</value>
+                <value>2</value>
             </setting>
             <setting name="StatsLogFile" serializeAs="String">
                 <value>stats.xml</value>
@@ -84,7 +105,7 @@
                 <value>cacheManager.xml</value>
             </setting>
             <setting name="ClientVersion" serializeAs="String">
-                <value>1.0.7</value>
+                <value>1.2.2</value>
             </setting>
             <setting name="xmdsResetTimeout" serializeAs="String">
                 <value>900</value>

=== modified file 'client/dotNET/bin/Release/XiboClient.vshost.exe.config'
--- client/dotNET/bin/Release/XiboClient.vshost.exe.config	2010-04-19 21:45:10 +0000
+++ client/dotNET/bin/Release/XiboClient.vshost.exe.config	2011-03-11 08:44:59 +0000
@@ -14,7 +14,7 @@
                 <value>DEFAULT</value>
             </setting>
             <setting name="XiboClient_xmds_xmds" serializeAs="String">
-                <value>http://localhost/xibo/xmds.php</value>
+                <value>http://localhost/Series%201.2/server-121-soap-wsdl/server/xmds.php</value>
             </setting>
             <setting name="ServerKey" serializeAs="String">
                 <value>yourserverkey</value>
@@ -61,6 +61,27 @@
             <setting name="scrollStepAmount" serializeAs="String">
                 <value>1</value>
             </setting>
+            <setting name="sizeX" serializeAs="String">
+                <value>0</value>
+            </setting>
+            <setting name="sizeY" serializeAs="String">
+                <value>0</value>
+            </setting>
+            <setting name="offsetX" serializeAs="String">
+                <value>0</value>
+            </setting>
+            <setting name="offsetY" serializeAs="String">
+                <value>0</value>
+            </setting>
+            <setting name="expireModifiedLayouts" serializeAs="String">
+                <value>True</value>
+            </setting>
+            <setting name="emptyLayoutDuration" serializeAs="String">
+                <value>10</value>
+            </setting>
+            <setting name="RequiredFilesFile" serializeAs="String">
+                <value>requiredFiles.xml</value>
+            </setting>
         </XiboClient.Properties.Settings>
     </userSettings>
     <applicationSettings>
@@ -75,7 +96,7 @@
                 <value>blacklist.xml</value>
             </setting>
             <setting name="Version" serializeAs="String">
-                <value>1</value>
+                <value>2</value>
             </setting>
             <setting name="StatsLogFile" serializeAs="String">
                 <value>stats.xml</value>
@@ -84,7 +105,7 @@
                 <value>cacheManager.xml</value>
             </setting>
             <setting name="ClientVersion" serializeAs="String">
-                <value>1.0.7</value>
+                <value>1.2.2</value>
             </setting>
             <setting name="xmdsResetTimeout" serializeAs="String">
                 <value>900</value>

=== modified file 'client/python/XiboClient.py'
--- client/python/XiboClient.py	2011-02-10 22:25:35 +0000
+++ client/python/XiboClient.py	2011-03-11 08:44:59 +0000
@@ -48,7 +48,11 @@
 import PIL.Image
 import math
 
+<<<<<<< TREE
 version = "1.3.0a1"
+=======
+version = "1.2.2a1"
+>>>>>>> MERGE-SOURCE
 
 # What layout schema version is supported
 schemaVersion = 1
@@ -908,8 +912,18 @@
                             tmpSize = long(f.attributes['size'].value)
                             tmpHash = str(f.attributes['md5'].value)
                             tmpType = str(f.attributes['type'].value)
+<<<<<<< TREE
                             tmpId = int(f.attributes['id'].value)
 
+=======
+                            try:
+                                tmpId = int(f.attributes['id'].value)
+                            except:
+                                # Layout background images don't come down with IDs
+                                # Blame Dan :D
+                                tmpId = 0
+
+>>>>>>> MERGE-SOURCE
                             if os.path.isfile(tmpPath) and os.path.getsize(tmpPath) == tmpSize:
                                 # File exists and is the right size
                                 # See if we checksummed it recently

=== added file 'server/install/database/27.sql'
--- server/install/database/27.sql	1970-01-01 00:00:00 +0000
+++ server/install/database/27.sql	2011-03-11 08:44:59 +0000
@@ -0,0 +1,9 @@
+
+ALTER TABLE  `display` ADD  `MediaInventoryStatus` TINYINT NOT NULL DEFAULT '0' ,
+ADD  `MediaInventoryXml` LONGTEXT NULL;
+
+/* VERSION UPDATE */
+/* Set the version table, etc */
+UPDATE `version` SET `app_ver` = '1.2.2', `XmdsVersion` = 2;
+UPDATE `setting` SET `value` = 0 WHERE `setting` = 'PHONE_HOME_DATE';
+UPDATE `version` SET `DBVersion` = '27';

=== added file 'server/install/database/28.sql'
--- server/install/database/28.sql	1970-01-01 00:00:00 +0000
+++ server/install/database/28.sql	2011-03-11 08:44:59 +0000
@@ -0,0 +1,8 @@
+
+ALTER TABLE  `display` ALTER  `MediaInventoryStatus` SET DEFAULT '0';
+
+/* VERSION UPDATE */
+/* Set the version table, etc */
+UPDATE `version` SET `app_ver` = '1.2.3', `XmdsVersion` = 2;
+UPDATE `setting` SET `value` = 0 WHERE `setting` = 'PHONE_HOME_DATE';
+UPDATE `version` SET `DBVersion` = '28';

=== modified file 'server/lib/app/kit.class.php'
--- server/lib/app/kit.class.php	2011-02-28 15:37:03 +0000
+++ server/lib/app/kit.class.php	2011-03-11 08:44:59 +0000
@@ -405,8 +405,11 @@
             {
                 include_once('lib/service/' . $class . '.class.php');
             }
+<<<<<<< TREE
             
             return;
+=======
+>>>>>>> MERGE-SOURCE
 	}
 
     /**

=== modified file 'server/lib/data/display.data.class.php'
--- server/lib/data/display.data.class.php	2011-02-10 20:42:24 +0000
+++ server/lib/data/display.data.class.php	2011-03-11 08:44:59 +0000
@@ -251,7 +251,7 @@
 	 * @return 
 	 * @param $license Object
 	 */
-	public function Touch($license, $clientAddress = '')
+	public function Touch($license, $clientAddress = '', $mediaInventoryComplete = 0, $mediaInventoryXml = '')
 	{
 		$db		=& $this->db;
 		$time 	= time();
@@ -266,6 +266,13 @@
                 if ($clientAddress != '')
                     $SQL .= sprintf(" , ClientAddress = '%s' ", $db->escape_string($clientAddress));
 
+                // Media Inventory Settings (if appropriate)
+                if ($mediaInventoryComplete != 0)
+                    $SQL .= sprintf(" , MediaInventoryStatus = %d ", $mediaInventoryComplete);
+
+                if ($mediaInventoryXml != '')
+                    $SQL .= sprintf(" , MediaInventoryXml = '%s' ", $mediaInventoryXml);
+
                 // Restrict to the display license
                 $SQL .= " WHERE license = '%s'";
                 $SQL = sprintf($SQL, $time, $license);
@@ -282,33 +289,131 @@
 		
 		return true;
 	}
-
-    /**
-     * Edits the default layout for a display
-     * @param <type> $displayId
-     * @param <type> $defaultLayoutId
-     * @return <type>
-     */
-    public function EditDefaultLayout($displayId, $defaultLayoutId)
-    {
-        $db	=& $this->db;
-
-        Debug::LogEntry($db, 'audit', 'IN', 'Display', 'EditDefaultLayout');
-
-        $SQL = sprintf('UPDATE display SET defaultLayoutId = %d WHERE displayID = %d ', $defaultLayoutId, $displayId);
-
-        if (!$db->query($SQL))
-        {
-            trigger_error($db->error());
-            $this->SetError(25012, __('Error updating this displays default layout.'));
-
-            return false;
-        }
-
-
-        Debug::LogEntry($db, 'audit', 'OUT', 'Display', 'EditDefaultLayout');
-
-        return true;
-    }
+<<<<<<< TREE
+
+    /**
+     * Edits the default layout for a display
+     * @param <type> $displayId
+     * @param <type> $defaultLayoutId
+     * @return <type>
+     */
+    public function EditDefaultLayout($displayId, $defaultLayoutId)
+    {
+        $db	=& $this->db;
+
+        Debug::LogEntry($db, 'audit', 'IN', 'Display', 'EditDefaultLayout');
+
+        $SQL = sprintf('UPDATE display SET defaultLayoutId = %d WHERE displayID = %d ', $defaultLayoutId, $displayId);
+
+        if (!$db->query($SQL))
+        {
+            trigger_error($db->error());
+            $this->SetError(25012, __('Error updating this displays default layout.'));
+
+            return false;
+        }
+
+
+        Debug::LogEntry($db, 'audit', 'OUT', 'Display', 'EditDefaultLayout');
+
+        return true;
+    }
+=======
+
+    /**
+     * Flags a display as being incomplete
+     * @param <type> $displayId
+     */
+    private function FlagIncomplete($displayId)
+    {
+        $db =& $this->db;
+
+        Debug::LogEntry($db, 'audit', sprintf('Flag DisplayID %d incomplete.', $displayId), 'display', 'NotifyDisplays');
+
+        $SQL = sprintf("UPDATE display SET MediaInventoryStatus = 3 WHERE displayID = %d", $displayId);
+
+        if (!$db->query($SQL))
+        {
+            trigger_error($db->error());
+            return $this->SetError(25004, 'Unable to Flag Display as incomplete');
+        }
+
+        return true;
+    }
+
+    /**
+     * Notify displays of this layout change
+     * @param <type> $layoutId
+     */
+    public function NotifyDisplays($layoutId)
+    {
+        $db =& $this->db;
+        $currentdate 	= time();
+        $rfLookahead    = Kit::ValidateParam(Config::GetSetting($db,'REQUIRED_FILES_LOOKAHEAD'), _INT);
+
+        $rfLookahead 	= $currentdate + $rfLookahead;
+
+        Debug::LogEntry($db, 'audit', sprintf('Checking for Displays to refresh on Layout %d', $layoutId), 'display', 'NotifyDisplays');
+
+        // Which displays does a change to this layout effect?
+        $SQL  = " SELECT DISTINCT display.DisplayID ";
+        $SQL .= "   FROM schedule_detail ";
+        $SQL .= " 	INNER JOIN lkdisplaydg ";
+        $SQL .= "	ON lkdisplaydg.DisplayGroupID = schedule_detail.DisplayGroupID ";
+        $SQL .= " 	INNER JOIN display ";
+        $SQL .= "	ON lkdisplaydg.DisplayID = display.displayID ";
+        $SQL .= " WHERE schedule_detail.layoutID = %d ";
+        $SQL .= " AND schedule_detail.FromDT < %d AND schedule_detail.ToDT > %d ";
+        $SQL .= " UNION ";
+        $SQL .= " SELECT DisplayID FROM display WHERE DefaultLayoutID = %d";
+
+        $SQL = sprintf($SQL, $layoutId, $rfLookahead, $currentdate - 3600, $layoutId);
+
+        Debug::LogEntry($db, 'audit', $SQL, 'display', 'NotifyDisplays');
+
+        if (!$result = $db->query($SQL))
+        {
+            trigger_error($db->error());
+            return $this->SetError(25037, __('Unable to get layouts for Notify'));
+        }
+
+        while ($row = $db->get_assoc_row($result))
+        {
+            // Notify each display in turn
+            $displayId = Kit::ValidateParam($row['DisplayID'], _INT);
+            $this->FlagIncomplete($displayId);
+        }
+    }
+
+        /**
+     * Edits the default layout for a display
+     * @param <type> $displayId
+     * @param <type> $defaultLayoutId
+     * @return <type>
+     */
+    public function EditDefaultLayout($displayId, $defaultLayoutId)
+    {
+        $db	=& $this->db;
+
+        Debug::LogEntry($db, 'audit', 'IN', 'Display', 'EditDefaultLayout');
+
+        $SQL = sprintf('UPDATE display SET defaultLayoutId = %d WHERE displayID = %d ', $defaultLayoutId, $displayId);
+
+        if (!$db->query($SQL))
+        {
+            trigger_error($db->error());
+            $this->SetError(25012, __('Error updating this displays default layout.'));
+
+            return false;
+        }
+
+        // Flag this display as not having all the content
+        $this->FlagIncomplete($displayId);
+
+        Debug::LogEntry($db, 'audit', 'OUT', 'Display', 'EditDefaultLayout');
+
+        return true;
+    }
+>>>>>>> MERGE-SOURCE
 }
 ?>

=== modified file 'server/lib/data/schedule.data.class.php'
--- server/lib/data/schedule.data.class.php	2011-02-10 19:46:44 +0000
+++ server/lib/data/schedule.data.class.php	2011-03-11 08:44:59 +0000
@@ -164,6 +164,11 @@
 				}
 			}
 		}
+
+                // Notify (dont error)
+                Kit::ClassLoader('Display');
+                $displayObject = new Display($db);
+                $displayObject->NotifyDisplays($layoutID);
 		
 		Debug::LogEntry($db, 'audit', 'OUT', 'Schedule', 'Add');
 		

=== modified file 'server/lib/include.php'
--- server/lib/include.php	2011-02-28 15:37:03 +0000
+++ server/lib/include.php	2011-03-11 08:44:59 +0000
@@ -107,8 +107,8 @@
 Config::Version($db);
 
 // Does the version in the DB match the version of the code?
-if (DBVERSION != '26')
-    die(sprintf('Incompatible database version detected. Please ensure your database and website versions match. You have %d and the website for %d', DBVERSION, 25));
+if (DBVERSION != '27')
+    die(sprintf('Incompatible database version detected. Please ensure your database and website versions match. You have %d and the website for %d', DBVERSION, 27));
 
 // What is the production mode of the server?
 if(Config::GetSetting($db, "SERVER_MODE")=="Test") ini_set('display_errors', 1);
@@ -143,4 +143,4 @@
 $pageManager->Render();
 
 die();
-?>
\ No newline at end of file
+?>

=== modified file 'server/lib/pages/display.class.php'
--- server/lib/pages/display.class.php	2011-02-13 17:16:01 +0000
+++ server/lib/pages/display.class.php	2011-03-11 08:44:59 +0000
@@ -37,6 +37,8 @@
     private $email_alert;
     private $alert_timeout;
 	private $ajax;
+        private $mediaInventoryStatus;
+        private $mediaInventoryXml;
 
 	function __construct(database $db, user $user)
 	{
@@ -71,7 +73,9 @@
             display.isAuditing,
             display.email_alert,
             display.alert_timeout,
-            display.ClientAddress
+            display.ClientAddress,
+            display.MediaInventoryStatus,
+            display.MediaInventoryXml
      FROM display
     WHERE display.displayid = %d
 SQL;
@@ -95,8 +99,10 @@
 				$this->licensed		 	= Kit::ValidateParam($row[4], _INT);
 				$this->inc_schedule 	= Kit::ValidateParam($row[5], _INT);
 				$this->auditing			= Kit::ValidateParam($row[6], _INT);
-                $this->email_alert      = Kit::ValidateParam($row[7], _INT);
-                $this->alert_timeout    = Kit::ValidateParam($row[8], _INT);
+                            $this->email_alert      = Kit::ValidateParam($row[7], _INT);
+                            $this->alert_timeout    = Kit::ValidateParam($row[8], _INT);
+                            $this->mediaInventoryStatus = Kit::ValidateParam($row[9], _INT);
+                            $this->mediaInventoryXml = Kit::ValidateParam($row[10], _HTMLSTRING);
 			}
 		}
 
@@ -309,7 +315,12 @@
                         CASE WHEN display.licensed = 1 THEN '<img src="img/act.gif">' ELSE '<img src="img/disact.gif">' END AS licensed,
                         CASE WHEN display.email_alert = 1 THEN '<img src="img/act.gif">' ELSE '<img src="img/disact.gif">' END AS email_alert,
                         displaygroup.DisplayGroupID,
-                        display.ClientAddress
+                        display.ClientAddress,
+                        CASE WHEN display.MediaInventoryStatus = 1 THEN '<img src="img/act.gif">'
+                             WHEN display.MediaInventoryStatus = 2 THEN '<img src="img/warn.gif">'
+                             ELSE '<img src="img/disact.gif">'
+                        END AS MediaInventoryStatus,
+                        display.MediaInventoryXml
 		  FROM display
                     INNER JOIN lkdisplaydg ON lkdisplaydg.DisplayID = display.DisplayID
                     INNER JOIN displaygroup ON displaygroup.DisplayGroupID = lkdisplaydg.DisplayGroupID
@@ -340,7 +351,13 @@
 		$msgDelete	= __('Delete');
 		$msgGroupSecurity = __('Group Security');
                 $msgClientAddress = __('IP Address');
-                $msgDefault = __('Default Layout');
+<<<<<<< TREE
+                $msgDefault = __('Default Layout');
+=======
+                $msgDefault = __('Default Layout');
+                $msgStatus = __('Status');
+                $msgMediaInventory = __('Media Inventory');
+>>>>>>> MERGE-SOURCE
 
 		$output = <<<END
 		<div class="info_table">
@@ -356,6 +373,7 @@
                         <th>$msgLogIn</th>
                         <th>$msgLastA</th>
                         <th>$msgClientAddress</th>
+                        <th>$msgStatus</th>
                         <th>$msgAction</th>
                     </tr>
                     </thead>
@@ -385,6 +403,7 @@
                         // Do we want to make a VNC link out of the display name?
                         $vncTemplate = Config::GetSetting($db, 'SHOW_DISPLAY_AS_VNCLINK');
                         $linkTarget = Kit::ValidateParam(Config::GetSetting($db, 'SHOW_DISPLAY_AS_VNC_TGT'), _STRING);
+                        $mediaInventoryStatusLight = Kit::ValidateParam($aRow[10], _STRING);
 
                         if ($vncTemplate != '' && $clientAddress != '')
                         {
@@ -396,22 +415,42 @@
                             $display = sprintf('<a href="' . $vncTemplate . '" title="VNC to ' . $display . '" target="' . $linkTarget . '">' . $display . '</a>', $clientAddress);
                         }
 
-                        $buttons = '';
-
-                        if ($user->usertypeid == 1)
-                        {
-                            $buttons = <<<END
-                        <button class='XiboFormButton' href='index.php?p=display&q=displayForm&displayid=$displayid'><span>$msgEdit</span></button>
-                        <button class='XiboFormButton' href='index.php?p=display&q=DeleteForm&displayid=$displayid'><span>$msgDelete</span></button>
-                        <button class="XiboFormButton" href="index.php?p=displaygroup&q=GroupSecurityForm&DisplayGroupID=$displayGroupID&DisplayGroup=$displayName"><span>$msgGroupSecurity</span></button>
-                        <button class="XiboFormButton" href="index.php?p=display&q=DefaultLayoutForm&DisplayId=$displayid"><span>$msgDefault</span></button>
-END;
-                        }
-                        else
-                        {
-                            $buttons = '<button class="XiboFormButton" href="index.php?p=display&q=DefaultLayoutForm&DisplayId=' . $displayid . '"><span>' . $msgDefault . '</span></button>';
-                        }
-
+<<<<<<< TREE
+                        $buttons = '';
+
+                        if ($user->usertypeid == 1)
+                        {
+                            $buttons = <<<END
+                        <button class='XiboFormButton' href='index.php?p=display&q=displayForm&displayid=$displayid'><span>$msgEdit</span></button>
+                        <button class='XiboFormButton' href='index.php?p=display&q=DeleteForm&displayid=$displayid'><span>$msgDelete</span></button>
+                        <button class="XiboFormButton" href="index.php?p=displaygroup&q=GroupSecurityForm&DisplayGroupID=$displayGroupID&DisplayGroup=$displayName"><span>$msgGroupSecurity</span></button>
+                        <button class="XiboFormButton" href="index.php?p=display&q=DefaultLayoutForm&DisplayId=$displayid"><span>$msgDefault</span></button>
+END;
+                        }
+                        else
+                        {
+                            $buttons = '<button class="XiboFormButton" href="index.php?p=display&q=DefaultLayoutForm&DisplayId=' . $displayid . '"><span>' . $msgDefault . '</span></button>';
+                        }
+
+=======
+                        $buttons = '';
+
+                        if ($user->usertypeid == 1)
+                        {
+                            $buttons = <<<END
+                        <button class='XiboFormButton' href='index.php?p=display&q=displayForm&displayid=$displayid'><span>$msgEdit</span></button>
+                        <button class='XiboFormButton' href='index.php?p=display&q=DeleteForm&displayid=$displayid'><span>$msgDelete</span></button>
+                        <button class="XiboFormButton" href="index.php?p=displaygroup&q=GroupSecurityForm&DisplayGroupID=$displayGroupID&DisplayGroup=$displayName"><span>$msgGroupSecurity</span></button>
+                        <button class="XiboFormButton" href="index.php?p=display&q=DefaultLayoutForm&DisplayId=$displayid"><span>$msgDefault</span></button>
+                        <button class="XiboFormButton" href="index.php?p=display&q=MediaInventory&DisplayId=$displayid"><span>$msgMediaInventory</span></button>
+END;
+                        }
+                        else
+                        {
+                            $buttons = '<button class="XiboFormButton" href="index.php?p=display&q=DefaultLayoutForm&DisplayId=' . $displayid . '"><span>' . $msgDefault . '</span></button>';
+                        }
+
+>>>>>>> MERGE-SOURCE
 			$output .= <<<END
 
 			<tr>
@@ -424,7 +463,12 @@
 			<td>$loggedin</td>
 			<td>$lastaccessed</td>
 			<td>$clientAddress</td>
-			<td>$buttons</td>
+<<<<<<< TREE
+			<td>$buttons</td>
+=======
+                        <td>$mediaInventoryStatusLight</td>
+			<td>$buttons</td>
+>>>>>>> MERGE-SOURCE
 END;
 		}
 		$output .= "</tbody></table></div>";
@@ -661,64 +705,183 @@
 		$response->SetFormSubmitResponse(__("The Display has been Deleted"));
 		$response->Respond();
 	}
-
-    /**
-     * Form for editing the default layout of a display
-     */
-    public function DefaultLayoutForm()
-    {
-        $db =& $this->db;
-        $response = new ResponseManager();
-
-        $displayId = Kit::GetParam('DisplayId', _GET, _INT);
-
-        if (!$defaultLayoutId = $this->db->GetSingleValue(sprintf("SELECT defaultlayoutid FROM display WHERE displayid = %d", $displayId),
-                'defaultlayoutid', _INT))
-        {
-            trigger_error($db->error());
-            trigger_error(__('Unable to get the default layout'), E_USER_ERROR);
-        }
-
-        $msgDefault = __('Default Layout');
-        $layoutList = dropdownlist('SELECT layoutid, layout FROM layout WHERE retired = 0 ORDER by layout', 'defaultlayoutid', $defaultLayoutId);
-
-        $form = <<<END
-            <form id="DefaultLayoutForm" class="XiboForm" method="post" action="index.php?p=display&q=DefaultLayout&DisplayId=$displayId">
-                <input type="hidden" name="DisplayId" value="$displayId">
-                <table>
-                    <tr>
-                        <td>$msgDefault<span class="required">*</span></td>
-                        <td>$layoutList</td>
-                    </tr>
-                </table>
-            </form>
-END;
-
-        $response->SetFormRequestResponse($form, __('Edit Default Layout'), '300px', '150px');
-        $response->AddButton(__('Cancel'), 'XiboDialogClose()');
-        $response->AddButton(__('Save'), '$("#DefaultLayoutForm").submit()');
-        $response->Respond();
-    }
-
-    /**
-     * Edit the default layout for a display
-     */
-    public function DefaultLayout()
-    {
-        $db =& $this->db;
-        $response = new ResponseManager();
-        $displayObject 	= new Display($db);
-
-        $displayId = Kit::GetParam('DisplayId', _POST, _INT);
-        $defaultLayoutId = Kit::GetParam('defaultlayoutid', _POST, _INT);
-
-        if (!$displayObject->EditDefaultLayout($displayId, $defaultLayoutId))
-        {
-            trigger_error(__('Cannot Edit this Display'), E_USER_ERROR);
-        }
-
-        $response->SetFormSubmitResponse(__('Display Saved.'));
-        $response->Respond();
-    }
+<<<<<<< TREE
+
+    /**
+     * Form for editing the default layout of a display
+     */
+    public function DefaultLayoutForm()
+    {
+        $db =& $this->db;
+        $response = new ResponseManager();
+
+        $displayId = Kit::GetParam('DisplayId', _GET, _INT);
+
+        if (!$defaultLayoutId = $this->db->GetSingleValue(sprintf("SELECT defaultlayoutid FROM display WHERE displayid = %d", $displayId),
+                'defaultlayoutid', _INT))
+        {
+            trigger_error($db->error());
+            trigger_error(__('Unable to get the default layout'), E_USER_ERROR);
+        }
+
+        $msgDefault = __('Default Layout');
+        $layoutList = dropdownlist('SELECT layoutid, layout FROM layout WHERE retired = 0 ORDER by layout', 'defaultlayoutid', $defaultLayoutId);
+
+        $form = <<<END
+            <form id="DefaultLayoutForm" class="XiboForm" method="post" action="index.php?p=display&q=DefaultLayout&DisplayId=$displayId">
+                <input type="hidden" name="DisplayId" value="$displayId">
+                <table>
+                    <tr>
+                        <td>$msgDefault<span class="required">*</span></td>
+                        <td>$layoutList</td>
+                    </tr>
+                </table>
+            </form>
+END;
+
+        $response->SetFormRequestResponse($form, __('Edit Default Layout'), '300px', '150px');
+        $response->AddButton(__('Cancel'), 'XiboDialogClose()');
+        $response->AddButton(__('Save'), '$("#DefaultLayoutForm").submit()');
+        $response->Respond();
+    }
+
+    /**
+     * Edit the default layout for a display
+     */
+    public function DefaultLayout()
+    {
+        $db =& $this->db;
+        $response = new ResponseManager();
+        $displayObject 	= new Display($db);
+
+        $displayId = Kit::GetParam('DisplayId', _POST, _INT);
+        $defaultLayoutId = Kit::GetParam('defaultlayoutid', _POST, _INT);
+
+        if (!$displayObject->EditDefaultLayout($displayId, $defaultLayoutId))
+        {
+            trigger_error(__('Cannot Edit this Display'), E_USER_ERROR);
+        }
+
+        $response->SetFormSubmitResponse(__('Display Saved.'));
+        $response->Respond();
+    }
+=======
+
+    /**
+     * Form for editing the default layout of a display
+     */
+    public function DefaultLayoutForm()
+    {
+        $db =& $this->db;
+        $response = new ResponseManager();
+
+        $displayId = Kit::GetParam('DisplayId', _GET, _INT);
+
+        if (!$defaultLayoutId = $this->db->GetSingleValue(sprintf("SELECT defaultlayoutid FROM display WHERE displayid = %d", $displayId),
+                'defaultlayoutid', _INT))
+        {
+            trigger_error($db->error());
+            trigger_error(__('Unable to get the default layout'), E_USER_ERROR);
+        }
+
+        $msgDefault = __('Default Layout');
+        $layoutList = dropdownlist('SELECT layoutid, layout FROM layout WHERE retired = 0 ORDER by layout', 'defaultlayoutid', $defaultLayoutId);
+
+        $form = <<<END
+            <form id="DefaultLayoutForm" class="XiboForm" method="post" action="index.php?p=display&q=DefaultLayout&DisplayId=$displayId">
+                <input type="hidden" name="DisplayId" value="$displayId">
+                <table>
+                    <tr>
+                        <td>$msgDefault<span class="required">*</span></td>
+                        <td>$layoutList</td>
+                    </tr>
+                </table>
+            </form>
+END;
+
+        $response->SetFormRequestResponse($form, __('Edit Default Layout'), '300px', '150px');
+        $response->AddButton(__('Cancel'), 'XiboDialogClose()');
+        $response->AddButton(__('Save'), '$("#DefaultLayoutForm").submit()');
+        $response->Respond();
+    }
+
+    /**
+     * Edit the default layout for a display
+     */
+    public function DefaultLayout()
+    {
+        $db =& $this->db;
+        $response = new ResponseManager();
+        $displayObject 	= new Display($db);
+
+        $displayId = Kit::GetParam('DisplayId', _POST, _INT);
+        $defaultLayoutId = Kit::GetParam('defaultlayoutid', _POST, _INT);
+
+        if (!$displayObject->EditDefaultLayout($displayId, $defaultLayoutId))
+        {
+            trigger_error(__('Cannot Edit this Display'), E_USER_ERROR);
+        }
+
+        $response->SetFormSubmitResponse(__('Display Saved.'));
+        $response->Respond();
+    }
+
+    /**
+     * Shows the inventory XML for the display
+     */
+    public function MediaInventory()
+    {
+        $db =& $this->db;
+        $response = new ResponseManager();
+        $displayId = Kit::GetParam('DisplayId', _GET, _INT);
+
+        if ($displayId == 0)
+            trigger_error(__('No DisplayId Given'));
+
+        // Get the media inventory xml for this display
+        $SQL = "SELECT MediaInventoryXml FROM display WHERE DisplayId = %d";
+        $SQL = sprintf($SQL, $displayId);
+
+        if (!$mediaInventoryXml = $db->GetSingleValue($SQL, 'MediaInventoryXml', _HTMLSTRING))
+        {
+            trigger_error($db->error());
+            trigger_error(__('Unable to get the Inventory for this Display'), E_USER_ERROR);
+        }
+
+        // Load the XML into a DOMDocument
+        $document = new DOMDocument("1.0");
+
+        if (!$document->loadXML($mediaInventoryXml))
+            trigger_error(__('Invalid Media Inventory'), E_USER_ERROR);
+
+        // Output a table
+        $table = '<table><tr><th>Type</th><th>Id</th><th>Complete</th><th>Last Checked</th><th>MD5</th></tr>';
+
+        $xpath = new DOMXPath($document);
+	$fileNodes = $xpath->query("//file");
+
+        foreach ($fileNodes as $node)
+        {
+            $type = $node->getAttribute('type');
+            $id = $node->getAttribute('id');
+            $complete = $node->getAttribute('complete');
+            $lastChecked = $node->getAttribute('lastChecked');
+            $md5 = $node->getAttribute('md5');
+
+            if ($complete == 0)
+                $complete = __('No');
+            else
+                $complete = __('Yes');
+
+            $table .= sprintf('<tr><td>%s</td><td>%s</td><td>%s</td><td>%s</td><td>%s</td>', $type, $id, $complete, $lastChecked, $md5);
+        }
+
+        $table .= '</table>';
+
+        $response->SetFormRequestResponse($table, __('Media Inventory'), '550px', '350px');
+        $response->AddButton(__('Close'), 'XiboDialogClose()');
+        $response->Respond();
+    }
+>>>>>>> MERGE-SOURCE
 }
 ?>

=== modified file 'server/lib/pages/layout.class.php'
--- server/lib/pages/layout.class.php	2011-02-28 15:58:42 +0000
+++ server/lib/pages/layout.class.php	2011-03-11 08:44:59 +0000
@@ -325,6 +325,12 @@
 			trigger_error($layoutObject->GetErrorMessage(), E_USER_ERROR);
 		}
 
+                // Notify (dont error)
+                Kit::ClassLoader('display');
+                $displayObject = new Display($db);
+                $displayObject->NotifyDisplays($this->layoutid);
+
+
 		$response->SetFormSubmitResponse(__('Layout Details Changed.'));
 		$response->Respond();
 	}

=== modified file 'server/lib/pages/region.class.php'
--- server/lib/pages/region.class.php	2010-05-29 11:16:24 +0000
+++ server/lib/pages/region.class.php	2011-03-11 08:44:59 +0000
@@ -76,6 +76,11 @@
 			$this->errMsg = __("Unable to Update that layouts XML with a new Media Node");
 			return false;
 		}
+
+                // Notify (dont error)
+                Kit::ClassLoader('display');
+                $displayObject = new Display($db);
+                $displayObject->NotifyDisplays($layoutid);
 		
 		return true;
 	}

=== modified file 'server/lib/service/service.wsdl'
--- server/lib/service/service.wsdl	2010-01-31 00:38:32 +0000
+++ server/lib/service/service.wsdl	2011-03-11 08:44:59 +0000
@@ -80,6 +80,15 @@
     <message name="SubmitStatsResponse">
         <part name="success" type="xsd:boolean" />
     </message>
+    <message name="MediaInventoryRequest">
+        <part name="version" type="xsd:string" />
+        <part name="serverKey" type="xsd:string" />
+        <part name="hardwareKey" type="xsd:string" />
+        <part name="mediaInventory" type="xsd:string" />
+    </message>
+    <message name="MediaInventoryResponse">
+        <part name="success" type="xsd:boolean" />
+    </message>
     <portType name="xmdsPortType">
         <operation name="RegisterDisplay">
             <documentation>Registered the Display on the Xibo Network</documentation>
@@ -121,6 +130,11 @@
             <input message="tns:SubmitStatsRequest"/>
             <output message="tns:SubmitStatsResponse"/>
         </operation>
+        <operation name="MediaInventory">
+            <documentation>Report back the clients MediaInventory</documentation>
+            <input message="tns:MediaInventoryRequest" />
+            <output message="tns:MediaInventoryResponse" />
+        </operation>
     </portType>
     <binding name="xmdsBinding" type="tns:xmdsPortType">
         <soap:binding style="rpc" transport="http://schemas.xmlsoap.org/soap/http"/>
@@ -196,6 +210,15 @@
                 <soap:body use="encoded" namespace="urn:xmds" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
             </output>
         </operation>
+        <operation name="MediaInventory">
+            <soap:operation soapAction="urn:xmds#MediaInventory" style="rpc"/>
+            <input>
+                <soap:body use="encoded" namespace="urn:xmds" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+            </input>
+            <output>
+                <soap:body use="encoded" namespace="urn:xmds" encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
+            </output>
+        </operation>
     </binding>
     <service name="xmds">
         <port name="xmdsPort" binding="tns:xmdsBinding">

=== modified file 'server/lib/service/xmdssoap.class.php'
--- server/lib/service/xmdssoap.class.php	2011-02-28 15:58:42 +0000
+++ server/lib/service/xmdssoap.class.php	2011-03-11 08:44:59 +0000
@@ -848,6 +848,66 @@
     }
 
     /**
+     * Store the media inventory for a client
+     * @param <type> $hardwareKey
+     * @param <type> $inventory
+     */
+    public function MediaInventory($version, $serverKey, $hardwareKey, $inventory)
+    {
+        $db =& $this->db;
+
+        // Sanitize
+        $serverKey 	= Kit::ValidateParam($serverKey, _STRING);
+        $hardwareKey 	= Kit::ValidateParam($hardwareKey, _STRING);
+        $version 	= Kit::ValidateParam($version, _STRING);
+        $inventory 	= Kit::ValidateParam($inventory, _HTMLSTRING);
+
+        // Make sure we are talking the same language
+        if (!$this->CheckVersion($version))
+            throw new SoapFault('Receiver', "Your client is not of the correct version for communication with this server. You can get the latest from http://www.xibo.org.uk");
+
+        // Auth this request...
+        if (!$this->AuthDisplay($hardwareKey))
+            throw new SoapFault('Receiver', 'This display client is not licensed');
+
+        if ($this->isAuditing == 1) Debug::LogEntry ($db, 'audit', $inventory, 'xmds', 'MediaInventory', '', $this->displayId);
+
+        // Check that the $inventory contains something
+        if ($inventory == '')
+            throw new SoapFault('Receiver', 'Inventory Cannot be Empty');
+
+        // Load the XML into a DOMDocument
+        $document = new DOMDocument("1.0");
+        $document->loadXML($inventory);
+
+        // Assume we are complete (but we are getting some)
+        $mediaInventoryComplete = 1;
+
+        $xpath = new DOMXPath($document);
+	$fileNodes = $xpath->query("//file");
+
+        foreach ($fileNodes as $node)
+        {
+            $mediaId = $node->getAttribute('id');
+            $complete = $node->getAttribute('complete');
+            $md5 = $node->getAttribute('md5');
+            $lastChecked = $node->getAttribute('lastChecked');
+
+            // TODO: Check the MD5?
+
+            // If this item is a 0 then set not complete
+            if ($complete == 0)
+                $mediaInventoryComplete = 2;
+        }
+
+        // Touch the display record
+        $displayObject = new Display($db);
+        $displayObject->Touch($hardwareKey, '', $mediaInventoryComplete, $inventory);
+
+        return true;
+    }
+
+    /**
      * Authenticates the display
      * @param <type> $hardwareKey
      * @return <type>

=== modified file 'server/modules/module_db_mysql.php'
--- server/modules/module_db_mysql.php	2010-09-22 20:11:36 +0000
+++ server/modules/module_db_mysql.php	2011-03-11 08:44:59 +0000
@@ -156,7 +156,7 @@
 
         if (!isset($row[$columnName]))
         {
-            $this->error_text = 'No such column';
+            $this->error_text = 'No such column or column is null';
             return false;
         }