Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
plotID_matlab
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Model registry
Monitor
Service Desk
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
plotID
plotID_matlab
Commits
be054396
Commit
be054396
authored
3 years ago
by
Lemmer, Jan
Browse files
Options
Downloads
Patches
Plain Diff
fixes
#38
parent
a2133489
No related branches found
No related tags found
3 merge requests
!13
PreRelease_V0.1
,
!12
PreRelease_V0.1
,
!9
fixes #38
Pipeline
#561489
failed
3 years ago
Stage: Run
Changes
3
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
+PlotID/Publish.m
+1
-2
1 addition, 2 deletions
+PlotID/Publish.m
+PlotID/createFileCopy.m
+18
-3
18 additions, 3 deletions
+PlotID/createFileCopy.m
+PlotID/fileCompare.m
+0
-17
0 additions, 17 deletions
+PlotID/fileCompare.m
with
19 additions
and
22 deletions
+PlotID/Publish.m
+
1
−
2
View file @
be054396
...
...
@@ -129,7 +129,6 @@ switch options.Method
sourcePath
=
fList
{
idx
,
'path'
};
relativeSourcePath
=
strrep
(
sourcePath
,
currentPath
,
''
);
%WIP relative PATh!!
if
contains
(
sourcePath
,{
'.h5'
,
'.hdf5'
})
% Linking only for HDF5
PlotID
.
createLinkedHDF5
(
relativeSourcePath
{
1
,
1
},
storPath
,
ID
);
end
...
...
This diff is collapsed.
Click to expand it.
+PlotID/createFileCopy.m
+
18
−
3
View file @
be054396
...
...
@@ -34,7 +34,6 @@ function [storagePaths] = createFileCopy(filePaths,folderName,storPath,ID,type)
error
([
type
,
' is not a valid type for createFileCopy'
])
end
%switch
% Write the file
RemotePath
=
fullfile
(
storPath
,
folderName
,
newfile
);
% Check if remote file already exists
...
...
@@ -51,7 +50,21 @@ function [storagePaths] = createFileCopy(filePaths,folderName,storPath,ID,type)
RemotePath
=
fullfile
(
storPath
,
folderName
,
...
[
name
(
1
:
end
-
length
(
num2str
(
count
))),
num2str
(
count
),
ext
]);
end
warning
(
'Filename already exists in data folder'
);
[
~
,
name
,
~
]
=
fileparts
(
RemotePath
);
msg
=
[
'Filename '
,
name
,
...
' already exists in the data folder'
newline
,
...
' PlotID will add an suffix if you continue.'
newline
,
...
' This can cause serious confusions.'
];
warning
(
msg
);
m
=
input
(
'Do you want to continue, Y/N [Y]:'
,
's'
);
if
ismember
(
m
,{
'N'
,
'n'
})
errorMSG
=
[
'Filename already exists in data folder.'
newline
,
...
' Rename the File and restart PlotID.'
];
error
();
end
end
copyfile
(
FileNameAndLocation
,
RemotePath
);
storagePaths
{
i
}
=
RemotePath
;
...
...
@@ -59,6 +72,8 @@ function [storagePaths] = createFileCopy(filePaths,folderName,storPath,ID,type)
disp
([
type
,
' sucessfully published'
]);
catch
warning
([
type
,
' export was not sucessful'
])
if
exist
(
'errorMSG'
)
error
(
errorMSG
);
end
%try
end
This diff is collapsed.
Click to expand it.
+PlotID/fileCompare.m
+
0
−
17
View file @
be054396
...
...
@@ -26,23 +26,6 @@ for i=1:height(fileList)
filepath
=
fullfile
(
fileList
{
i
,
'folder'
},
fileList
{
i
,
'name'
});
%% old
%crucial performance due to matlab bug
%(see https://de.mathworks.com/matlabcentral/answers/338553-performance-of-system-dos-function)
% if ispc
% filename = ['"',filename,'"'];% Bugfix for spaces in path
% status = comparejava
% % system call that causes performance issues
% [status,~] = system(['fc ' filename ' ' char(filepath)]);
% % 0 -> identical, 1 -> not identical
% status = ~status; % false (not identical), true(identical)
%
% elseif isunix %untested!
% [status,~] = system(['diff ' filename ' ' filepath]);
% else
% warning('Platform not supported')
% end
%% comparison with java function
% TODO test paths with spaces
status
=
comparejava
(
filename
,
char
(
filepath
));
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment