diff --git a/DataUploader/Properties/PublishProfiles/Zip.pubxml.user b/DataUploader/Properties/PublishProfiles/Zip.pubxml.user index 46585fb..720ae2e 100644 --- a/DataUploader/Properties/PublishProfiles/Zip.pubxml.user +++ b/DataUploader/Properties/PublishProfiles/Zip.pubxml.user @@ -10,7 +10,7 @@ by editing this MSBuild file. In order to learn more about this please visit htt - 02/03/2016 15:59:04 + 02/05/2016 15:01:12 09/03/2015 11:38:11 @@ -43,16 +43,16 @@ by editing this MSBuild file. In order to learn more about this please visit htt 09/03/2015 11:38:11 - 02/03/2016 15:59:05 + 02/05/2016 15:01:13 - 02/03/2016 15:13:36 + 02/03/2016 16:38:11 09/18/2015 10:37:41 - 02/03/2016 15:33:45 + 02/05/2016 14:25:04 \ No newline at end of file diff --git a/DataUploader/ResyncLastDocs.aspx.cs b/DataUploader/ResyncLastDocs.aspx.cs index e0c7211..ab1a3c9 100644 --- a/DataUploader/ResyncLastDocs.aspx.cs +++ b/DataUploader/ResyncLastDocs.aspx.cs @@ -46,15 +46,29 @@ namespace DataUploader { } // recupero ultimo numero doc caricato... int lastNum = 0; - try + // provo a leggerlo da richiesta... + if (Request.QueryString["lastNum"] != "") { - var content = client.DownloadString(ConfigurationManager.AppSettings["remoteDocUrl"]); // http://webscr.steamware.net/Rigamonti/Upload/Document - // converto a int! - lastNum = Convert.ToInt32(content); - logger.Info("Recuperato last num: {0}", lastNum); + try + { + lastNum = Convert.ToInt32(Request.QueryString["lastNum"]); + logger.Info("Imposto last num: {0}", lastNum); + } + catch + { } + } + // se nON HO lastNum lo richiedo in remoto + if (lastNum == 0) + { + try + { + var content = client.DownloadString(ConfigurationManager.AppSettings["remoteDocUrl"]); // http://webscr.steamware.net/Rigamonti/Upload/Document + lastNum = Convert.ToInt32(content); // converto a int! + logger.Info("Recuperato last num: {0}", lastNum); + } + catch + { } } - catch - { } // recupero i dati da caricare... string[] urlsUpdate = GestData.proc.reloadLastDocs(lastNum, Num2Reload); if (demoMode) diff --git a/DataUploader/bin/DataUploader.dll b/DataUploader/bin/DataUploader.dll index 1f662a2..9a7c0d9 100644 Binary files a/DataUploader/bin/DataUploader.dll and b/DataUploader/bin/DataUploader.dll differ diff --git a/ReleaseClienti/DataUploader.zip b/ReleaseClienti/DataUploader.zip index dceb211..f3bf620 100644 Binary files a/ReleaseClienti/DataUploader.zip and b/ReleaseClienti/DataUploader.zip differ diff --git a/ReleaseClienti/DataUploader/bin/DataUploader.dll b/ReleaseClienti/DataUploader/bin/DataUploader.dll index c577188..9a7c0d9 100644 Binary files a/ReleaseClienti/DataUploader/bin/DataUploader.dll and b/ReleaseClienti/DataUploader/bin/DataUploader.dll differ diff --git a/WebSCR/bin/WebSCR.dll.config b/WebSCR/bin/WebSCR.dll.config index c8ac7a0..83dd4d1 100644 --- a/WebSCR/bin/WebSCR.dll.config +++ b/WebSCR/bin/WebSCR.dll.config @@ -12,7 +12,7 @@ - +