Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Z
zoholib
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Container Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
gems
zoholib
Commits
9ec1f0c4
Commit
9ec1f0c4
authored
Apr 28, 2020
by
Jose Ernesto Suarez
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'fix/coql-pagination' into 'master'
Fix/coql pagination See merge request
!3
parents
88f34a8f
6ffbb2c2
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
22 additions
and
15 deletions
+22
-15
.gitignore
.gitignore
+1
-1
CHANGELOG.md
CHANGELOG.md
+2
-1
version.rb
lib/zoholib/version.rb
+1
-1
zoho_basic_client.rb
lib/zoholib/zoho_basic_client.rb
+18
-12
No files found.
.gitignore
View file @
9ec1f0c4
.DS_Store
.DS_Store
zoholib
-
*.gem
zoholib*.gem
CHANGELOG.md
View file @
9ec1f0c4
TO-DO
v0.0.5b:
\ No newline at end of file
-
Se corrige la el motodo de consulta coql para poder recibir mas de 200 registros.
\ No newline at end of file
lib/zoholib/version.rb
View file @
9ec1f0c4
# frozen_string_literal: true
# frozen_string_literal: true
module
Wedoops
module
Wedoops
module
Zoholib
module
Zoholib
VERSION
=
'0.0.
4
b'
VERSION
=
'0.0.
5
b'
end
end
end
end
\ No newline at end of file
lib/zoholib/zoho_basic_client.rb
View file @
9ec1f0c4
...
@@ -130,8 +130,8 @@ module Wedoops
...
@@ -130,8 +130,8 @@ module Wedoops
# ojo, maxrecords no tiene en cuenta cuantos registros se descaargan
# ojo, maxrecords no tiene en cuenta cuantos registros se descaargan
# en cada ocasion por lo que puede devolver registros de mas
# en cada ocasion por lo que puede devolver registros de mas
# como resto de la llamada anterior
# como resto de la llamada anterior
page
=
1
#
page=1
maxrecords
=-
1
#
maxrecords=-1
result
=
Hash
.
new
result
=
Hash
.
new
result
[
:data
]
=
Array
.
new
result
[
:data
]
=
Array
.
new
params
.
delete
(
:page
)
if
params
.
has_key?
(
:page
)
params
.
delete
(
:page
)
if
params
.
has_key?
(
:page
)
...
@@ -140,24 +140,30 @@ module Wedoops
...
@@ -140,24 +140,30 @@ module Wedoops
params
.
delete
(
:max_records
)
params
.
delete
(
:max_records
)
end
end
loop
do
loop
do
params
.
merge!
(
page:
page
)
#
params.merge!(page: page)
response
=
self
.
query
(
coql
)
response
=
self
.
query
(
build_offset
(
coql
,
result
[
:data
].
size
)
)
return
response
if
response
[
:status
]
==
"error"
return
response
if
response
[
:status
]
==
"error"
if
response
[
:info
][
:more_records
]
==
true
#pp response
page
+=
1
result
[
:data
].
concat
(
response
[
:data
])
result
[
:data
].
concat
(
response
[
:data
])
break
if
maxrecords
>
0
&&
result
[
:data
].
size
>=
maxrecords
break
unless
response
[
:info
][
:more_records
]
else
break
end
@logger
.
debug
(
"
#{
result
[
:data
].
size
}
records"
)
@logger
.
debug
(
"
#{
result
[
:data
].
size
}
records"
)
@logger
.
debug
(
"
#{
result
[
:data
].
last
}
"
)
@logger
.
debug
(
"
#{
result
[
:data
].
last
}
"
)
end
end
return
result
return
result
end
end
private
private
def
build_offset
(
query
,
offset
=
0
)
# las consultas de COQL no paginan, trabajan con offsets
@logger
.
debug
(
"Generando el offset"
)
uplimit
=
200
#+ offset
query_offset
=
"
#{
query
}
LIMIT
#{
offset
}
,
#{
uplimit
}
"
@logger
.
debug
(
query_offset
)
return
query_offset
end
def
build_header
def
build_header
{
:headers
=>
{
"Authorization"
=>
"Zoho-oauthtoken
#{
@token
}
"
}}
{
:headers
=>
{
"Authorization"
=>
"Zoho-oauthtoken
#{
@token
}
"
}}
end
end
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment