Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Hiding the two Cautious sections that are not used for the moment and…
… adding the possibility to change the number of pages as startpages. #229
- Loading branch information
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -13,23 +13,23 @@ angular.module('hyphe.settingsController', []) | |
| $scope.loading = true | ||
| $scope.destroying = false | ||
| $scope.resetting = false; | ||
| $scope.saving = false; | ||
|
|
||
|
|
||
|
|
||
| $scope.destroy = function(){ | ||
| if (confirm('Are you sure you want to PERMANENTLY destroy this corpus?')) { | ||
| $scope.destroying = true | ||
| $scope.status = {message: 'Destroying corpus'}; | ||
| api.destroyCorpus({ | ||
| id:corpus.getId() | ||
| }, function(){ | ||
| $location.path('/project/'+$scope.corpusId+'/'); | ||
| }, function(){ | ||
| $scope.status = {message: "Error destroying project", background:'danger'}; | ||
| }) | ||
| } | ||
| } | ||
|
|
||
| $scope.resetCorpus = function(){ | ||
| if (confirm('Are you sure you want to reset this corpus?')) { | ||
|
|
@@ -55,60 +55,91 @@ angular.module('hyphe.settingsController', []) | |
| $scope.status = {message:'max depth must be comprised between 0 and ' + $scope.maxmax_depth, background:'danger'} | ||
| return false; | ||
| } | ||
|
|
||
| if ($scope.nbOfPages < 0 || $scope.nbOfPages > 50){ | ||
| $scope.status = {message:'Please enter a valid number of pages as Startpages (between 0 and 9)', background:'danger'} | ||
This comment has been minimized.
Sorry, something went wrong. |
||
| return false; | ||
| } | ||
|
|
||
| return true; | ||
| } | ||
|
|
||
| $scope.toggle = function(item, list, replace){ | ||
| var toggle = false; | ||
| for (var index = 0; index < list.length; index++) { | ||
| if ((list[index].startsWith("pages") && item.startsWith("pages")) || list[index] === item) { | ||
| console.log(item) | ||
| list.splice(index, 1); | ||
| toggle = true; | ||
| } | ||
| } | ||
| if (!toggle || replace) { | ||
| console.log('iciaussi?') | ||
| list.push(item); | ||
| } | ||
| }; | ||
This comment has been minimized.
Sorry, something went wrong. |
||
|
|
||
|
|
||
| $scope.editSettings = function(save){ | ||
|
|
||
|
|
||
| if (save) { | ||
| $scope.saving = true; | ||
|
|
||
| //construction of the array of startpages mode | ||
| $scope.ed_defaultStartpagesMode = []; | ||
| if ($scope.startpages_homepage) { | ||
| console.log($scope.startpages_homepage) | ||
This comment has been minimized.
Sorry, something went wrong. |
||
| $scope.ed_defaultStartpagesMode.push('homepage'); | ||
| } | ||
| if ($scope.startpages_prefixes) { | ||
| $scope.ed_defaultStartpagesMode.push('prefixes'); | ||
| } | ||
| if ($scope.startpages_pages) { | ||
| $scope.ed_defaultStartpagesMode.push('pages-' + $scope.nbOfPages); | ||
| } | ||
| if (checkValid()) { | ||
|
|
||
| var modifiedOptions = { | ||
| "max_depth": $scope.ed_max_depth, | ||
| "defaultStartpagesMode": $scope.ed_defaultStartpagesMode, | ||
| "proxy": { | ||
| "port": $scope.ed_proxy_port, | ||
| "host": $scope.ed_proxy_host | ||
| }, | ||
| "phantom": { | ||
| "timeout": $scope.ed_timeout, | ||
| "ajax_timeout": $scope.ed_ajax_timeout, | ||
| "idle_timeout": $scope.ed_idle_timeout, | ||
| "whitelist_domains": $scope.ed_whitelist | ||
| }, | ||
| "follow_redirects": $scope.ed_follow_redirects, | ||
| "defaultCreationRule": $scope.ed_defaultCreationRule | ||
| }; | ||
|
|
||
| $scope.status = {message: 'Saving new settings'}; | ||
|
|
||
| api.setCorpusOptions({ | ||
| id: $scope.corpusId, | ||
| options: modifiedOptions | ||
| }, function (options) { | ||
| $scope.options = options; | ||
| $scope.status = {}; | ||
| $scope.saving = false; | ||
| console.log("Settings successfully updated"); | ||
| }, function () { | ||
| $scope.status = {message: 'Could not save new settings.', background: 'danger'} | ||
| $scope.saving = false; | ||
| console.error("Settings could not be updated"); | ||
| }); | ||
| } else { | ||
| $scope.saving = false; | ||
| if (save && !checkValid()) return; | ||
This comment has been minimized.
Sorry, something went wrong. 
boogheta
Member
|
||
| } | ||
| } | ||
| $scope.ed_max_depth = $scope.options.max_depth; | ||
| $scope.ed_defaultStartpagesMode = $scope.options.defaultStartpagesMode.slice(); | ||
| console.log($scope.ed_defaultStartpagesMode); | ||
This comment has been minimized.
Sorry, something went wrong. |
||
| $scope.ed_proxy_host = $scope.options.proxy.host+""; | ||
| $scope.ed_proxy_port = $scope.options.proxy.port+0; | ||
| $scope.ed_timeout = $scope.options.phantom.timeout+0; | ||
|
|
@@ -117,7 +148,19 @@ angular.module('hyphe.settingsController', []) | |
| $scope.ed_whitelist = $scope.options.phantom.whitelist_domains.slice(); | ||
| $scope.ed_follow_redirects = $scope.options.follow_redirects.slice(); | ||
| $scope.ed_defaultCreationRule = $scope.options.defaultCreationRule+""; | ||
| $scope.startpages_homepage = $scope.options.defaultStartpagesMode.includes('homepage'); | ||
| $scope.startpages_prefixes = $scope.options.defaultStartpagesMode.includes('prefixes'); | ||
| $scope.startpages_pages = $scope.options.defaultStartpagesMode.some(x => x.startsWith('pages')) | ||
| $scope.corpusSettingsEditMode = !$scope.corpusSettingsEditMode; | ||
|
|
||
| //define the current number of most cited pages as start pages | ||
| for (var i=0; i<$scope.options.defaultStartpagesMode.length; i++){ | ||
| if ($scope.ed_defaultStartpagesMode[i].startsWith('pages')){ | ||
| $scope.nbOfPages = parseInt($scope.ed_defaultStartpagesMode[i].slice(-1)); | ||
| console.log($scope.nbOfPages) | ||
This comment has been minimized.
Sorry, something went wrong. |
||
| return; | ||
This comment has been minimized.
Sorry, something went wrong.
boogheta
Member
|
||
| } | ||
| } | ||
| }; | ||
|
|
||
|
|
||
|
|
||
knowN