Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
irods-microservices
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Package registry
Model registry
Operate
Terraform modules
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
RDM Infrastructure
irods-microservices
Commits
be242f19
Commit
be242f19
authored
7 years ago
by
Paul Frederiks
Browse files
Options
Downloads
Patches
Plain Diff
Minimize the number of compiler warnings and fix RPM dependencies
parent
b81084ef
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
CMakeLists.txt
+11
-13
11 additions, 13 deletions
CMakeLists.txt
src/msiLoadMetadataFromXml.cc
+14
-7
14 additions, 7 deletions
src/msiLoadMetadataFromXml.cc
src/msiXsltApply.cc
+1
-1
1 addition, 1 deletion
src/msiXsltApply.cc
with
26 additions
and
21 deletions
CMakeLists.txt
+
11
−
13
View file @
be242f19
...
@@ -18,30 +18,30 @@ add_compile_options(-std=c++11
...
@@ -18,30 +18,30 @@ add_compile_options(-std=c++11
-DRODS_SERVER
-DRODS_SERVER
-Wall
-Wall
-Wextra
-Wextra
-Wpedantic
-Wcast-align
-Wcast-align
-Wredundant-decls
-Wredundant-decls
-Wuninitialized
-Wuninitialized
-Wpedantic
-Wconversion
-Wconversion
-Wno-missing-field-initializers
-Wno-missing-field-initializers
-Wno-unused-parameter
)
-Wno-unused-parameter
)
find_package
(
Boost 1.51 COMPONENTS locale REQUIRED
)
find_package
(
Boost 1.51 COMPONENTS locale REQUIRED
)
include_directories
(
${
Boost_INCLUDE_DIR
}
)
include_directories
(
SYSTEM
${
Boost_INCLUDE_DIR
}
)
find_package
(
CURL REQUIRED
)
find_package
(
CURL REQUIRED
)
include_directories
(
${
CURL_INCLUDE_DIRS
}
)
include_directories
(
SYSTEM
${
CURL_INCLUDE_DIRS
}
)
find_package
(
LibXml2 REQUIRED
)
find_package
(
LibXml2 REQUIRED
)
include_directories
(
${
LIBXML2_INCLUDE_DIR
}
)
include_directories
(
SYSTEM
${
LIBXML2_INCLUDE_DIR
}
)
find_package
(
LibXslt REQUIRED
)
find_package
(
LibXslt REQUIRED
)
include_directories
(
${
LIBXSLT_INCLUDE_DIR
}
)
include_directories
(
SYSTEM
${
LIBXSLT_INCLUDE_DIR
}
)
find_package
(
Jansson REQUIRED
)
find_package
(
Jansson REQUIRED
)
include_directories
(
${
JANSSON_INCLUDE_DIRS
}
)
include_directories
(
SYSTEM
${
JANSSON_INCLUDE_DIRS
}
)
include_directories
(
"/usr/include/irods"
)
include_directories
(
SYSTEM
"/usr/include/irods"
)
add_library
(
msiSetUpperCaseWhereQuery SHARED src/msiSetUpperCaseWhereQuery.cc
)
add_library
(
msiSetUpperCaseWhereQuery SHARED src/msiSetUpperCaseWhereQuery.cc
)
add_library
(
msiStrToUpper SHARED src/msiStrToUpper.cc
)
add_library
(
msiStrToUpper SHARED src/msiStrToUpper.cc
)
...
@@ -92,19 +92,17 @@ set(CPACK_GENERATOR "RPM")
...
@@ -92,19 +92,17 @@ set(CPACK_GENERATOR "RPM")
set
(
CPACK_PACKAGE_NAME
"irods-uu-microservices"
)
set
(
CPACK_PACKAGE_NAME
"irods-uu-microservices"
)
set
(
CPACK_PACKAGE_VENDOR
"Utrecht University <fbyoda@uu.nl>"
)
set
(
CPACK_PACKAGE_VENDOR
"Utrecht University <fbyoda@uu.nl>"
)
set
(
CPACK_PACKAGE_CONTACT
"Utrecht University <fbyoda@uu.nl>"
)
set
(
CPACK_PACKAGE_CONTACT
"Utrecht University <fbyoda@uu.nl>"
)
set
(
CPACK_PACKAGE_VERSION
"4.1.11_0.
3.3
"
)
set
(
CPACK_PACKAGE_VERSION
"4.1.11_0.
5.1
"
)
set
(
CPACK_PACKAGE_DESCRIPTION_FILE
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/package/description.txt"
)
set
(
CPACK_PACKAGE_DESCRIPTION_FILE
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/package/description.txt"
)
set
(
CPACK_PACKAGE_DESCRIPTION_SUMMARY
"Miscellaneous microservices developed by Utrecht university."
)
set
(
CPACK_PACKAGE_DESCRIPTION_SUMMARY
"Miscellaneous microservices developed by Utrecht university."
)
set
(
CPACK_RESOURCE_FILE_README
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/README.md"
)
set
(
CPACK_RESOURCE_FILE_README
"
${
CMAKE_CURRENT_SOURCE_DIR
}
/README.md"
)
set
(
CPACK_RPM_PACKAGE_RELEASE
"
1
"
)
set
(
CPACK_RPM_PACKAGE_RELEASE
"
4
"
)
set
(
CPACK_RPM_PACKAGE_LICENSE
"LGPLv3"
)
set
(
CPACK_RPM_PACKAGE_LICENSE
"LGPLv3"
)
set
(
CPACK_RPM_PACKAGE_REQUIRES
"boost-locale >= 1.51"
)
set
(
CPACK_RPM_PACKAGE_REQUIRES
"boost-locale >= 1.51, libcurl >= 7.29.0, libxml2 >= 2.9.1, libxslt >= 1.1.28, jansson >= 2.10"
)
set
(
CPACK_RPM_PACKAGE_REQUIRES
"libcurl >= 7.29.0"
)
set
(
CPACK_RPM_PACKAGE_CONFLICTS
"rit-irods-microservices, irods-microservice-plugins-loadmeta"
)
set
(
CPACK_RPM_PACKAGE_REQUIRES
"libxml2 >= 2.9.1"
)
set
(
CPACK_RPM_PACKAGE_REQUIRES
"libxslt >= 1.1.28"
)
set
(
CPACK_RPM_PACKAGE_URL
"https://github.com/UtrechtUniversity/irods-uu-microservices"
)
set
(
CPACK_RPM_PACKAGE_URL
"https://github.com/UtrechtUniversity/irods-uu-microservices"
)
set
(
CPACK_RPM_PACKAGE_AUTOREQ 0
)
set
(
CPACK_RPM_PACKAGE_AUTOREQ 0
)
set
(
CPACK_RPM_PACKAGE_AUTOPROV 0
)
set
(
CPACK_RPM_PACKAGE_AUTOPROV 0
)
...
...
This diff is collapsed.
Click to expand it.
src/msiLoadMetadataFromXml.cc
+
14
−
7
View file @
be242f19
...
@@ -114,6 +114,13 @@ msiLoadMetadataFromXml(msParam_t *targetObj, msParam_t *xmlParam, ruleExecInfo_t
...
@@ -114,6 +114,13 @@ msiLoadMetadataFromXml(msParam_t *targetObj, msParam_t *xmlParam, ruleExecInfo_t
/* for new AVU creation */
/* for new AVU creation */
modAVUMetadataInp_t
modAVUMetadataInp
;
modAVUMetadataInp_t
modAVUMetadataInp
;
char
attribute
[]
=
"Attribute"
;
char
value
[]
=
"Value"
;
char
unit
[]
=
"Unit"
;
char
target
[]
=
"Target"
;
char
add
[]
=
"add"
;
char
collection
[]
=
"-C"
;
char
dataObject
[]
=
"-d"
;
const
size_t
MAX_ATTR_NAME_LEN
=
2700
;
const
size_t
MAX_ATTR_NAME_LEN
=
2700
;
const
size_t
MAX_ATTR_VALUE_LEN
=
2700
;
const
size_t
MAX_ATTR_VALUE_LEN
=
2700
;
const
size_t
MAX_ATTR_UNIT_LEN
=
250
;
const
size_t
MAX_ATTR_UNIT_LEN
=
250
;
...
@@ -261,7 +268,7 @@ msiLoadMetadataFromXml(msParam_t *targetObj, msParam_t *xmlParam, ruleExecInfo_t
...
@@ -261,7 +268,7 @@ msiLoadMetadataFromXml(msParam_t *targetObj, msParam_t *xmlParam, ruleExecInfo_t
if
(
nodes
->
nodeTab
[
i
])
if
(
nodes
->
nodeTab
[
i
])
{
{
attrName
=
(
char
*
)
xmlNodeGetContent
(
getChildNodeByName
(
nodes
->
nodeTab
[
i
],
"A
ttribute
"
));
attrName
=
(
char
*
)
xmlNodeGetContent
(
getChildNodeByName
(
nodes
->
nodeTab
[
i
],
a
ttribute
));
if
(
!
attrName
)
{
if
(
!
attrName
)
{
rodsLog
(
LOG_ERROR
,
"msiLoadMetadataFromXml: AVU does not contain an Attribute element"
);
rodsLog
(
LOG_ERROR
,
"msiLoadMetadataFromXml: AVU does not contain an Attribute element"
);
continue
;
continue
;
...
@@ -276,7 +283,7 @@ msiLoadMetadataFromXml(msParam_t *targetObj, msParam_t *xmlParam, ruleExecInfo_t
...
@@ -276,7 +283,7 @@ msiLoadMetadataFromXml(msParam_t *targetObj, msParam_t *xmlParam, ruleExecInfo_t
i
+
1
);
i
+
1
);
}
}
attrValue
=
(
char
*
)
xmlNodeGetContent
(
getChildNodeByName
(
nodes
->
nodeTab
[
i
],
"V
alue
"
));
attrValue
=
(
char
*
)
xmlNodeGetContent
(
getChildNodeByName
(
nodes
->
nodeTab
[
i
],
v
alue
));
if
(
!
attrValue
)
{
if
(
!
attrValue
)
{
rodsLog
(
LOG_ERROR
,
"msiLoadMetadataFromXml: AVU #%d does not contain a Value element"
,
rodsLog
(
LOG_ERROR
,
"msiLoadMetadataFromXml: AVU #%d does not contain a Value element"
,
i
+
1
);
i
+
1
);
...
@@ -293,7 +300,7 @@ msiLoadMetadataFromXml(msParam_t *targetObj, msParam_t *xmlParam, ruleExecInfo_t
...
@@ -293,7 +300,7 @@ msiLoadMetadataFromXml(msParam_t *targetObj, msParam_t *xmlParam, ruleExecInfo_t
continue
;
continue
;
}
}
attrUnit
=
(
char
*
)
xmlNodeGetContent
(
getChildNodeByName
(
nodes
->
nodeTab
[
i
],
"U
nit
"
));
attrUnit
=
(
char
*
)
xmlNodeGetContent
(
getChildNodeByName
(
nodes
->
nodeTab
[
i
],
u
nit
));
/* attrUnit can be null */
/* attrUnit can be null */
if
(
attrUnit
)
{
if
(
attrUnit
)
{
attrUnitLen
=
strlen
(
attrUnit
);
attrUnitLen
=
strlen
(
attrUnit
);
...
@@ -306,7 +313,7 @@ msiLoadMetadataFromXml(msParam_t *targetObj, msParam_t *xmlParam, ruleExecInfo_t
...
@@ -306,7 +313,7 @@ msiLoadMetadataFromXml(msParam_t *targetObj, msParam_t *xmlParam, ruleExecInfo_t
/* init modAVU input */
/* init modAVU input */
memset
(
&
modAVUMetadataInp
,
0
,
sizeof
(
modAVUMetadataInp_t
));
memset
(
&
modAVUMetadataInp
,
0
,
sizeof
(
modAVUMetadataInp_t
));
modAVUMetadataInp
.
arg0
=
"
add
"
;
modAVUMetadataInp
.
arg0
=
add
;
/* Use target object if one was provided, otherwise look for it in the XML doc */
/* Use target object if one was provided, otherwise look for it in the XML doc */
if
(
myTargetObjInp
->
objPath
!=
NULL
&&
strlen
(
myTargetObjInp
->
objPath
)
>
0
)
if
(
myTargetObjInp
->
objPath
!=
NULL
&&
strlen
(
myTargetObjInp
->
objPath
)
>
0
)
...
@@ -315,15 +322,15 @@ msiLoadMetadataFromXml(msParam_t *targetObj, msParam_t *xmlParam, ruleExecInfo_t
...
@@ -315,15 +322,15 @@ msiLoadMetadataFromXml(msParam_t *targetObj, msParam_t *xmlParam, ruleExecInfo_t
}
}
else
else
{
{
modAVUMetadataInp
.
arg2
=
xmlURIUnescapeString
((
char
*
)
xmlNodeGetContent
(
getChildNodeByName
(
nodes
->
nodeTab
[
i
],
"T
arget
"
)),
modAVUMetadataInp
.
arg2
=
xmlURIUnescapeString
((
char
*
)
xmlNodeGetContent
(
getChildNodeByName
(
nodes
->
nodeTab
[
i
],
t
arget
)),
MAX_NAME_LEN
,
NULL
);
MAX_NAME_LEN
,
NULL
);
}
}
/* check if data or collection */
/* check if data or collection */
if
(
isColl
(
rsComm
,
modAVUMetadataInp
.
arg2
,
&
coll_id
)
<
0
)
{
if
(
isColl
(
rsComm
,
modAVUMetadataInp
.
arg2
,
&
coll_id
)
<
0
)
{
modAVUMetadataInp
.
arg1
=
"-d"
;
modAVUMetadataInp
.
arg1
=
dataObject
;
}
else
{
}
else
{
modAVUMetadataInp
.
arg1
=
"-C"
;
modAVUMetadataInp
.
arg1
=
collection
;
}
}
modAVUMetadataInp
.
arg3
=
attrName
;
modAVUMetadataInp
.
arg3
=
attrName
;
...
...
This diff is collapsed.
Click to expand it.
src/msiXsltApply.cc
+
1
−
1
View file @
be242f19
...
@@ -268,5 +268,5 @@ extern "C" {
...
@@ -268,5 +268,5 @@ extern "C" {
}
;
// extern "C"
}
// extern "C"
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