diff --git a/RMuseum/Models/Ganjoor/GanjoorCat.cs b/RMuseum/Models/Ganjoor/GanjoorCat.cs
index f6028f86..94185b91 100644
--- a/RMuseum/Models/Ganjoor/GanjoorCat.cs
+++ b/RMuseum/Models/Ganjoor/GanjoorCat.cs
@@ -53,5 +53,25 @@ namespace RMuseum.Models.Ganjoor
/// TOC Style
///
public GanjoorTOC TableOfContentsStyle { get; set; }
+
+ ///
+ /// Category Type
+ ///
+ public GanjoorCatType CatType { get; set; }
+
+ ///
+ /// additional descripion or note
+ ///
+ public string Description { get; set; }
+
+ ///
+ /// order when mixed with poems
+ ///
+ public int MixedModeOrder { get; set; }
+
+ ///
+ /// published
+ ///
+ public bool Published { get; set; }
}
}
diff --git a/RMuseum/Models/Ganjoor/GanjoorCatType.cs b/RMuseum/Models/Ganjoor/GanjoorCatType.cs
new file mode 100644
index 00000000..a92c7c3d
--- /dev/null
+++ b/RMuseum/Models/Ganjoor/GanjoorCatType.cs
@@ -0,0 +1,13 @@
+namespace RMuseum.Models.Ganjoor
+{
+ ///
+ /// Ganjoor Category Type
+ ///
+ public enum GanjoorCatType
+ {
+ Default = 0,
+ Poet = 1,
+ Book = 2,
+ BookPart = 3,
+ }
+}
diff --git a/RMuseum/Models/Ganjoor/GanjoorPage.cs b/RMuseum/Models/Ganjoor/GanjoorPage.cs
index ec69e16a..78714093 100644
--- a/RMuseum/Models/Ganjoor/GanjoorPage.cs
+++ b/RMuseum/Models/Ganjoor/GanjoorPage.cs
@@ -109,5 +109,15 @@ namespace RMuseum.Models.Ganjoor
/// post date
///
public DateTime PostDate { get; set; }
+
+ ///
+ /// no index (search engines are blocked to index the page)
+ ///
+ public bool NoIndex { get; set; }
+
+ ///
+ /// if a page url is changed, store the old URL here to be redirected automatically
+ ///
+ public string RedirectFromFullUrl { get; set; }
}
}
diff --git a/RMuseum/Models/Ganjoor/GanjoorPoem.cs b/RMuseum/Models/Ganjoor/GanjoorPoem.cs
index ab44c382..37fa0a9b 100644
--- a/RMuseum/Models/Ganjoor/GanjoorPoem.cs
+++ b/RMuseum/Models/Ganjoor/GanjoorPoem.cs
@@ -93,5 +93,20 @@ namespace RMuseum.Models.Ganjoor
/// old collection page url e.g /saadi/tayyebat
///
public string OldTagPageUrl { get; set; }
+
+ ///
+ /// order when mixed with categories
+ ///
+ public int MixedModeOrder { get; set; }
+
+ ///
+ /// published
+ ///
+ public bool Published { get; set; }
+
+ ///
+ /// language
+ ///
+ public string Language { get; set; }
}
}
diff --git a/RMuseum/Models/Ganjoor/GanjoorVerse.cs b/RMuseum/Models/Ganjoor/GanjoorVerse.cs
index e3b565f6..d90dbfbf 100644
--- a/RMuseum/Models/Ganjoor/GanjoorVerse.cs
+++ b/RMuseum/Models/Ganjoor/GanjoorVerse.cs
@@ -40,6 +40,11 @@
///
public int? CoupletIndex { get; set; }
+ ///
+ /// language
+ ///
+ public string Language { get; set; }
+
public override string ToString()
{
return Text;
diff --git a/RMuseum/RMuseum.xml b/RMuseum/RMuseum.xml
index 0d31477d..f2ef0cdd 100644
--- a/RMuseum/RMuseum.xml
+++ b/RMuseum/RMuseum.xml
@@ -5683,6 +5683,31 @@
TOC Style
+
+
+ Category Type
+
+
+
+
+ additional descripion or note
+
+
+
+
+ order when mixed with poems
+
+
+
+
+ published
+
+
+
+
+ Ganjoor Category Type
+
+
half century
@@ -6184,6 +6209,16 @@
post date
+
+
+ no index (search engines are blocked to index the page)
+
+
+
+
+ if a page url is changed, store the old URL here to be redirected automatically
+
+
snapshot of ganjoor pages to keep track of their changes
@@ -6404,6 +6439,21 @@
old collection page url e.g /saadi/tayyebat
+
+
+ order when mixed with categories
+
+
+
+
+ published
+
+
+
+
+ language
+
+
poem correction
@@ -6966,6 +7016,11 @@
couplet index
+
+
+ language
+
+
id
diff --git a/RMuseum/Services/Implementation/GanjoorService-Partials/GanjoorService-SQLiteUtils.cs b/RMuseum/Services/Implementation/GanjoorService-Partials/GanjoorService-SQLiteUtils.cs
index fa297422..eb6b30bd 100644
--- a/RMuseum/Services/Implementation/GanjoorService-Partials/GanjoorService-SQLiteUtils.cs
+++ b/RMuseum/Services/Implementation/GanjoorService-Partials/GanjoorService-SQLiteUtils.cs
@@ -718,6 +718,7 @@ namespace RMuseum.Services.Implementation
FullUrl = $"{parentCat.FullUrl}/{url}",
ParentId = parentCat.Id,
TableOfContentsStyle = GanjoorTOC.Analyse,
+ Published = true,
};
context.GanjoorCategories.Add(dbCat);
@@ -789,6 +790,7 @@ namespace RMuseum.Services.Implementation
UrlSlug = urlSlug,
FullTitle = $"{parentFullTitle} » {title}",
FullUrl = $"{parentCat.FullUrl}/{urlSlug}",
+ Published = true,
};
List poemVerses = new List();
diff --git a/RMuseum/Services/Implementation/GanjoorService.cs b/RMuseum/Services/Implementation/GanjoorService.cs
index 34564f7c..282b9c32 100644
--- a/RMuseum/Services/Implementation/GanjoorService.cs
+++ b/RMuseum/Services/Implementation/GanjoorService.cs
@@ -2053,7 +2053,8 @@ namespace RMuseum.Services.Implementation
FullUrl = $"{parentPage.FullUrl}/{nextPoemUrlSluf}",
GanjoorMetreId = poem.GanjoorMetre == null ? null : poem.GanjoorMetre.Id,
SourceName = poem.SourceName,
- SourceUrlSlug = poem.SourceUrlSlug
+ SourceUrlSlug = poem.SourceUrlSlug,
+ Published = true,
};
@@ -3043,6 +3044,7 @@ namespace RMuseum.Services.Implementation
UrlSlug = poet.FullUrl.Substring(1),
FullUrl = poet.FullUrl,
TableOfContentsStyle = GanjoorTOC.Analyse,
+ Published = true,
};
_context.GanjoorCategories.Add(dbCat);