diff --git a/Builder/IISMainHandler/build.txt b/Builder/IISMainHandler/build.txt index 568d4cb..2a55d55 100644 --- a/Builder/IISMainHandler/build.txt +++ b/Builder/IISMainHandler/build.txt @@ -1 +1 @@ -2061 \ No newline at end of file +2070 \ No newline at end of file diff --git a/FLocal.Migration.Console/ShallerDBProcessor.cs b/FLocal.Migration.Console/ShallerDBProcessor.cs index b7216cd..44b186e 100644 --- a/FLocal.Migration.Console/ShallerDBProcessor.cs +++ b/FLocal.Migration.Console/ShallerDBProcessor.cs @@ -234,8 +234,10 @@ namespace FLocal.Migration.Console { { User.TableSpec.FIELD_REGDATE, new ScalarFieldValue(date.ToUTCString()) }, { User.TableSpec.FIELD_SHOWPOSTSTOUSERS, new ScalarFieldValue(User.ENUM_SHOWPOSTSTOUSERS_ALL) }, { User.TableSpec.FIELD_BIOGRAPHY, new ScalarFieldValue("") }, + { User.TableSpec.FIELD_BIOGRAPHYUBB, new ScalarFieldValue("") }, { User.TableSpec.FIELD_LOCATION, new ScalarFieldValue("") }, { User.TableSpec.FIELD_SIGNATURE, new ScalarFieldValue("") }, + { User.TableSpec.FIELD_SIGNATUREUBB, new ScalarFieldValue("") }, { User.TableSpec.FIELD_TITLE, new ScalarFieldValue("") }, { User.TableSpec.FIELD_TOTALPOSTS, new ScalarFieldValue("0") }, { User.TableSpec.FIELD_USERGROUPID, new ScalarFieldValue("1") }, @@ -305,7 +307,9 @@ namespace FLocal.Migration.Console { } } + System.Console.WriteLine(); System.Console.WriteLine("Finished parsing"); + System.Console.WriteLine("Total inserts: " + inserts.Count); System.Console.ReadLine(); int j=0; foreach(var insert in inserts) { diff --git a/FLocal.Migration.Console/UploadProcessor.cs b/FLocal.Migration.Console/UploadProcessor.cs index ae22553..562dfe1 100644 --- a/FLocal.Migration.Console/UploadProcessor.cs +++ b/FLocal.Migration.Console/UploadProcessor.cs @@ -24,7 +24,7 @@ namespace FLocal.Migration.Console { } else { string[] parts = info.Name.Split('.'); if(parts.Length != 2) throw new FLocalException("wrong file name"); - int raw = int.Parse(parts[0].PHPSubstring(4)); + int raw = int.Parse(parts[0].Substring(4)); int id; switch(parts[1].ToLower()) { case "jpg": @@ -41,8 +41,9 @@ namespace FLocal.Migration.Console { } if(info != null) { try { - Upload.LoadById(id); + Upload.LoadById(id).LoadIfNotLoaded(); System.Console.Write("-"); + //System.Console.WriteLine("-" + id); } catch(NotFoundInDBException) { try { UploadManager.UploadFile(