Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge pull request #34 from Ordisoftware/dev
Dev
  • Loading branch information
Ordisoftware committed Sep 20, 2019
2 parents 4f41009 + 2b1991f commit 734899c
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 8 deletions.
10 changes: 10 additions & 0 deletions Project/Properties/DataSources/ImportResults.datasource
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
This file is automatically generated by Visual Studio .Net. It is
used to store generic object data source configuration information.
Renaming the file extension or editing the content of this file may
cause the file to be unrecognizable by the program.
-->
<GenericObjectDataSource DisplayName="ImportResults" Version="1.0" xmlns="urn:schemas-microsoft-com:xml-msdatasource">
<TypeInfo>Ordisoftware.HebrewWords.ImportResults, Ordisoftware.HebrewWords, Version=2.1.0.0, Culture=neutral, PublicKeyToken=null</TypeInfo>
</GenericObjectDataSource>
2 changes: 1 addition & 1 deletion Project/Source/Enums/Translations.cs
Expand Up @@ -21,7 +21,7 @@ namespace Ordisoftware.HebrewWords
static public class Translations
{

static public readonly string NewLine = NewLine;
static public readonly string NewLine = Environment.NewLine;

static public readonly Dictionary<string, string> ApplicationDescriptionText
= new Dictionary<string, string>()
Expand Down
11 changes: 4 additions & 7 deletions Project/Source/Forms/MainForm/MainForm.DB.LoadFromFiles.cs
Expand Up @@ -58,11 +58,9 @@ void nextChapter()
book = DataSet.Books.NewBooksRow();
book.ID = Guid.NewGuid().ToString();
book.Number = (int)bookid + 1;
book.Original = BooksNames.Original[bookid];
book.Hebrew = BooksNames.Hebrew[bookid];
book.Name = bookid.ToString().Replace("_", " ");
book.Translation = "";
book.Memo = "";
DataSet.Books.AddBooksRow(book);
int countChapters = 0;
int countVerses = 0;
Expand All @@ -75,10 +73,9 @@ void nextChapter()
if ( chapter != null ) nextChapter();
countVerses = 0;
chapter = DataSet.Chapters.NewChaptersRow();
chapter.ID = Guid.NewGuid().ToString();
chapter.BookID = book.ID;
chapter.Number = ++countChapters;
chapter.Memo = "";
chapter.ID = Guid.NewGuid().ToString(); ;
chapter.BookID = book.ID;
}
else
{
Expand All @@ -90,9 +87,9 @@ void nextChapter()
{
countWords = 0;
verse = DataSet.Verses.NewVersesRow();
verse.Number = ++countVerses;
verse.ID = Guid.NewGuid().ToString();
verse.ChapterID = chapter.ID;
verse.Number = ++countVerses;
verse.Comment = "";
listWordsOriginal = list[0].Replace("-", " ").Split(' ').Reverse().ToArray();
listWordsHebrew = Letters.ConvertToHebrewFont(list[0]).Split(' ').Reverse().ToArray();
Expand All @@ -107,9 +104,9 @@ void nextChapter()
if ( listWordsHebrew[i] != "" )
{
word = DataSet.Words.NewWordsRow();
word.Number = ++countWords;
word.ID = Guid.NewGuid().ToString();
word.VerseID = verse.ID;
word.Number = ++countWords;
word.Original = new string(listWordsOriginal[i].Reverse().ToArray());
word.Hebrew = listWordsHebrew[i];
word.Translation = "";
Expand Down

0 comments on commit 734899c

Please sign in to comment.